I would have done (and did) the same: easiest thing first.
Seeing as there are not many things left to swap out and test, and that my FPR (or inlet metering valve (IMV), as I've been reading?) came with a HP pump attached to it, I'm going to see if I can swap it out.
I'm very fortunate to have had the time and opportunity to investigate this step-by-step. But I think it's been going on for long enough and I need to know whether this will potentially cure the problem or not.
Either way, next week's school run will not be on public transport!