Well after a bit of manoeuvring I managed to get it all on the one board....
and managed to find a mistake along the way, so going well now.
Will post after I've built it and tested it. If anyone is tempted, do not use the layout above - it will not work.
I have done a few layouts, as for or some reason I like making my own, even when they are plenty available. I sometimes do have power on a daughter board just so I can have a single point to connect all the ground connections to and big capacitors can take up too much room on layouts.