Been a while since I've posted an update on this!
After flying the plane on the mk2 wing for a while I concluded that the wing still had too much taper. It was a little too ready to drop a wing which doesn't really make for an enjoyable flying experience! So, I made a 3rd set of wings with a totally different plan form (and a new set of tail feathers to go with it) and I think I've finally got there! Tested it today in lovely calm conditions and was really happy with it. Does 'the book' and can do all the 3D stuff too. Knife-edge is really impressive and the rudder is very powerful.
I was on my own so no vid or shots of it in the air but I hope to get some soon. Only thing now is that it's a little under-powered for my liking, but that could be as simple as trying a few different props. Anyway, it was good to get it back in the air again.