Our 2002 XG350 (65000 miles) has developed a VERY annoying and time consuming challenge. We can’t set the fill handle on the gas hose when we fill up. We have to slowly trickle fuel in or the pump will shut off. I’m assuming there’s some kind of sensor going out?