Well I definitely wasn't happy with either of those two layouts, and I was even less happy with the unpicking. Thankfully it was only the hand stitching as frog stitching is a real pain with the shorter stitch length I prefer these days. As I now press my seams open where possible I have shortened my stitch length to add strength to the seam. Why am I now pressing seams open? Well it gives less bulky spots when machine quilting and while my machine quilting leaves a lot to be desired....one day it will be to dream for. Hey I dream about that now!
So after unpicking a number of seams I have worked out a third layout and it's looking OK. I still need to work out what to do in those spaces around the central block but that is tomorrow's problem.