I know this post is a little old but thought it could use a bump. I looked into swapping in a Toyota diesel engine but decided against it because of emissions issues in CA. Everything I read led me to believe that I wouldn't be able to register it after the swap. I just decided to run the 3.0...
