If you are getting spark at the plugs when the motor is turning then I don't think you HES sensors would be bad, as they also trigger the spark timing.
When you say that you took the tank to a shop, they checked the pump using the tank side of the pigtail connector, right? Have you check the bike side of that connection? That 4 pin connector has had a history of going bad.