I experienced the same symptoms, and they went away when I switched tanks.
Dropped the tank that was suspect and it was full of rust, my fuel filter was full of rust, shower head was broken off, and fuel lines clogged up.
Ended up replacing both tanks and all the fuel lines and that fixed...