Don't let the CA thing scare you away. One of the reasons they make less power is because the boost is lower from the factory. De-tuned I guess you can say.
The manifold swap is pretty easy and straightforward. My CA car runs just fine now. It ran OK before I did the swap, nothing to be ashamed of. If you find one with the original trap you may even get a free turbo.
http://www.peachparts.com/Wikka/OM617CalToFed