Although I doubt that the 4L30E and Aisin/Warner tranny would have the same pattern, BUT stranger things have happened.

As far as the shifted case goes... I had those thoughts myself of changing it out, but there was enough different between the two cases that I decided to forego that and just get it back together again.

EDIT:
Differences are:
2/4 rail is not mechanically shifted via the shifter but with the actuator and some of those parts are not present in the GEN2 SOTF case. Mechanically it is the same pertaining to the gears. The difference with the SOTF version, like I say is the actuator, and the mechanical one is interlinked on the shift rails (High/Lo & the 2/4)

I had a shifted case next to me when we were rebuilding the SOTF case last week @ Portal. The Tera kit was just slightly different and I thought it was different enough to just not fit with the shifted case and the SOTF rails etc.

With the Tera kit already installed, I think you can definitely make that happen. The shifter is in the same place, same shifter just a different knob.