Thanks all, I have matching polished – White Industries, Chainset, Crank, Square Taper BB, Freewheel and Hubs. Hence why I was hoping to keep it all.
My next plan is to keep the hubs, build onto some new rims (moving to 29er from 26) with the existing freewheel but change the sprocket (which is possible with the WI freewheel as its all servicable and changeable), sell the chainset, crank, BB. Then either try and find a nice polished chainset or just a nice good one.