Going to an older motor is not going to get you ref'd in Cali. You need at least a motor that is within the same OBD as your current setup.
It may suck, but your best bet is to either find another OBD2 B16, or go for the D-swap. Check with your DMV laws and see what you can do.
Check your local forums and Craigslist. Salvage what you can off your motor, and piece together the parts you need to get another B16 in there.