Mwah ha ha!
Fixed it - got fed up so bought a new fuel filter, fitted, bled, and guess what? Runs like perfect!
Oh well, good exercise, I now have very clean MAP and MAF sensors, and swirl chamber! All worthwhile things to do in their own right, I guess, and at least the solenoid valve cost me...