What the pump you reckon,maybe its the reason i needed a AFPR in the first place !!!
Time for upgrade maybe....
You could do that but I'd swap the filter (for a Z32 one) and clean the MAF. Cheaper than just guessing at parts and if they aren't the problem and you end up changing the pump then you've set a good clean base for that for little outlay.
Logic.