Stalling

years ago, I had a bad fuel pump on a 67 273 2bbl cuda. I was working my way thru college, so I was pretty bucks-down. I'd pull the pump and hand actuate it and it would pump fuel from a pan I had filled with gas, so I put it back on, and it would work for a few days or a week, then it would quit again. So I pulled it back off, and "retested" it. I got it to pump again, so I put it back on. Shortly thereafter, when I checked the oil and I was about a quart or more overfilled it dawned on me what was happening. The pump was leaking gas into the engine. I bought a new pump, changed the oil and filter, but the damage was done.
I replaced the fuel pump but still had the problem. I think there may be water in the tank. At idle it ran fine. If I put in drive or reverse it would idle rough. I put a bottle of HEET in to absorb the water. I revved the engine a couple of times and it was fine. I'm trying to run the tank dry by running the engine and siphoning the gas out. I really don't want to pull the tank. I'm also going to blow the fuel fines out. Thanks for your advise.