running ofab, 1.9zvh, t34, Intergrale injectors , grs

I was plodding along at 50 and suddendly out of the blue the car kind of spluttered and then cleared then spluttered again and then popped and banged (imagine running out of fuel that's the only way to describe it) it did this for around 2/3 mins and was fine again for around 20 miles and then repeated it. I pulled over and allowed the car to idle then set of again. It drove fine for 17 miles and then repeated itself , I left it a week and thought with it being a much cooler day it I'd give it another bash but it's kinda got worse, I mean now I can't get past 3k with out it all but dying on me. When I release the throttle and reapply it I get acceleration again but when I reach 3k it died again, the pump is making an odd noise so I'm "assuming" this is the cause? Am i on the right track?

It's a bosh 023 fuel pump should I swap like for like? I see MD do an uprated cossie fuel pump that's the equivalent of this would that be ok to use?.

Cheers Matt