thanks guys, some good suggestions jimjim2012.
I'm never going to go fully rigid, I saw a picture of one of these bikes that had a rigid fork and had hit a huge hole and the whole downtube/Head tube lug was destroyed!
It was on ebay... in it's sorry state! There's also 2 other issues with...