2003 SPECIFIC UPDATE:
I have a 2003 (1/03) and it also had the 4 plug NAV. I worked up a little graphic for what you described above that may help (Certainly helps me to refer back to this). I should also point out that you cannot simply remove the pins from the old NAV M8 connector and put them directly into the new M9 as they are a different pin size. You could do that with the old M5 though but it's only one wire.
View attachment 2279770
Update: 4/22/20 There is hope for the 2003 people if there are more swaps to come. I have figured out which connectors are the M8 and M5 males above and will be ordering those parts today. Assuming they mate up, and they should, I'll be able to modify the JTM (Jerry's The Man) adapter harness to make this virtually plug and play. At least as easy as the later ones. (EDIT: Arrived and they fit perfectly. Just crimp pins, click them in and you are done)