I recently had similar issues with my 06. Jumper blocks under tank were corroded. Entire wiring harness was replaced under YES warranty. Dealer stated that there have been a number of issues with corrosion in the connectors on the harness. Other threads recommend using dielectric lube/sealant...