Sounds like fun

M54B30 (330ci) all the way, I'd avoid the 2.2 like the plague. The M54B25 (325ci) is a pretty great engine too! Avoid the M52B25TU (323ci 2.5) if you can as it's not as potent as the M54, and this is where I'll shut up and let somebody more knowledgeable step in for the more technical details :P