S4gasm

I just got a 96 hatch with a gsr swap. It has an obd1 conversion. It wasn't wired very well and I need to convert it back to obd2 to pass inspections in Pa. I am assuming that when I unplug the conversion harness and plug in the 98 type r ecu I bought that it will throw all sorts of codes. I was just wondering if there was anyone in the area that has experience wiring swaps. If you do or know anyone that does, shoot me a price to re-wire my swap and help me make it obd2 again. Ideally, I want to get it to where it will run fine throwing no codes obd2, but be able to just switch back and forth between the type r ecu and my chipped obd1 ecu.