...I'm back with another update FWIW. As noted above, truck had a TSB on the fuel tank and pickup assy for this problem. I convinced the dealer to get the new tank and pickup, but put in a Titan 55gal tank instead. They were only concerned about the programming (how odd is that) to reset...