Racetronix makes a rewire that plugs in underneath the vehicle by the gas tank for 05+ with no access panel. Still has the small wiring between that connector and the pump but at least it replaces everything else.