Thanks for the tips. I’ll strip the frame down and give it a polish then, that seems to be the consensus here anyway!
Out of interest, you mention alternative forks, I think there was a DAve Yates fork, not sure why I got the P2s (probably the DY ones were too pricey). What alternatives are out...