That's a great way to start. To me, it looks like the only thing that is missing this the connecter at the end of the pump run. It's just a dual pin deutsch connector.
You would need 3 of these to make the pig tail that would run to the pump.
I would think you could just zip tie up the gauge pig tails behind the side panel. Of course, as you said, they will not work.
The big issue with this knowing the difference change years. 06 and newer will be relays and the 07 and later will be timers, which you do not want in your case.
Good luck with your up grade.
You might find this post useful.