I'd find a low mile 3.0L and reseal it, I mean if you want more power that is. You've got a few years of options to deal with Cali emissions if I am understanding them correctly.

__________________
Current: 1975 450SEL, 83 300D, 88 Yugo GVX, 90 300D OM603 swap, 91 F150 4.6 4v swap, 93 190E Sportline LE 3.0L M104 swap, 93 190E Sportline LE Megasquirt, 03 Sprinter, 06 E500 4Matic wagon.