Hello!
In my first message I mentioned preparations for 3.7 engine swap. It's already done, I just wanted to repeat what few people wrote before me - this is extremaly straightforward procedure for NA manual Crossfire, pretty much a bolt on. Donor engine was taken from 2003 (or later) SL350 with 64,000km (40,000 miles) - excellent condition with all the wiring and ancilliares for ~900 USD. Shop quoted 300$ for montage (eastern EU prices, gotta love them). So far results are way above what I expected, it is certainly a far better NA tuning base than 3,2 engine. HUGE improvement in low RPM is what strikes You first. No issues whatsoever, I still have old and beaten stock clutch, but no more slippage that usual despite significantly increased torque. Only other mod so far is straight-pipe exhaust with stock muffler cutout (see last clip).
Below some demonstration:

Dyno testing in few days to asses baseline before moving forward with next mods.