When I read your first post, the notion of pulling a B16A2 for a B16A didn't make any sense at all. I mean, why go through all the trouble of a swap to gain nothing.

But, if it were me, I would just swap the long block over and use all the accessories, intake, exhaust, etc. and run the engine OBD2. That seems like it would be the easiest solution. There *might* be some minor differences in castings and what-not but the overall design shouldn't be too much different.

The other possibility is to swap all the OBD1 stuff over and run an OBD2 to OBD1 conversion harness with an OBD1 ecu if your buddy just has to run the car OBD1.