Sounds like somebody is jerking your chain.. our bikes don't have fuel pumps and why should the tank only be under warranty for one year when the rest of the bike is for two years.
And 2 hours labor for replacing a fuel tank is ridiculous ... time for a call to Peter Carleo.