Thanks for this recommendation, I must admit I oversimplified it in my head initialy. I measured everything, bought new spokes and will be doing a 2 cross 28H pattern on the rear hub and radial 28H at the front.
This spoke caculator was awesome:
and video to go with it here: https://www.youtube.com/watch?v=EvkvQ7i9DB8
I will also be attempting truing the wheels directly on the bicycle as best I can.
Will post pics when done!