I've just been going through the same issues with my 2004 GU III. The Aerpro connector you need is the APP0121.
I bought the APP0120 first, found it didn't fit and had to take it back to swap over....