Thanks for all the advice.
Everything went well today and all is back together. No leaks, no damage and no dramas today, which was good!
I've had a quick shake down and it all works but the handbrake needs adjusting for the MOT. I need to check the NS brake isn't binding anymore but that is a 5 minute job tomorrow, then off to the MOT station. Fingers crossed.
