While it's on the rare side for you to run out of pumps with your fuel mods at that power level, 621 is a bit of RWHP and it is understandable. I'd remove the PPRV valve first and if that doesn't get your FPDC comfortable, consider a BAP. But you're doing the right thing first by checking to make sure your current system is operating correctly.