30-1601 used on gti-r (30-1600 made for gti-r)

My s13 sr20det is no longer around, I have a b13 sentra with a gti-r motor and I want to continue to use my 30-1601U. This is my only problem with AEM, unlike haltech it is some what vehicle specific.

No matter, I am going to use the 30-1601U where the 1600 should be used. MY QUESTION IS:

can I just go in and change the options for the slightly different pinout in the full options menu, or am I going to need to physically re-pin the harness. All the dedicated pins are the same, its the PNP and avail pins that are different, so in theory I should just be able to change them in the options, right?

Or is it even easier then that, do i just open up a start up cal for the gti-r engine, save that to the ems and then the options will be changed to suit the new .cal file?

Please help