I'm not familiar with how the civilian GP controllers work, unfortunately, so I'm not much help there. For what it's worth, based on your photos, it doesn't look like you're too far off from the original military wiring...you could return it to the stock setup, if you were inclined to do so...