I just got off the phone with Z1. They won't do a OBDI swap into a OBDII car at their shop due to emissions laws. He said its possible but If I did it I would probably run into issues during smog inspection.
I then called my local smog shop as asked them what would they do if they ran into a 96 car with all OBDI equipment. He said because of the model year the vehicle would need to be running OBDII to pass SMOG. Talk about government bullshit.