Thanks Daniel
But progress after a lot of measuring and fiddling! The right thigh is not symmetrical to the left - cut 1-2 cm longer on the inner thigh. Fixing this will solve a lot.
In addition, I could probably adjust the torso to be a little shorter overall - to stop the codpiece and bum "hanging" This will help to space things out better.
I'm not really sure what's the best was to fix that, looking at the diagram. The chestplate is already cut down, so what are the options? Can I remould the shoulder straps down and closer, or can I readjust strapping and overlap something some more? It would be really great if this could all look and fit a little better.