Went through the same thing a couple yrs ago. The top feed works great w/the stock fuel pump, haven't had any fuel related issues since.
Good luck
Dave