Why not just buy a freakin clip with a 1jz, and swap it and the RHD stuff from it.  Your car was legal before, and would already be tagged.  Just food for thought.  Its what I want to do...  Lots less headaches....Course I live in Alabama, so not so much red tape as Cali...