engineering software

OK, I am not sure if this is the correct forum to be typing this in, but here goes.

I am looking at doing a full engine rebuild in my car, and I was wondering if there was any "virtual dynamometer" style software that I could use to adjust internals and the like to see what sort of HP gain I can expect from different mods, I've found a few but they deal mainly with Ford or GM engines and I am really looking for one that will allow me to adjust a BMW engine.

I am also looking at adding a Supercharger (Screw style) and methanol injection, so these features would be a nice part of the software too.

Any recommendation would be helpful

Thanks
Andjeti

Dyno 2000 is what I have, but yes it's airflow modeling is based upon 2 valve wedge heads supplying large bore cylinders. If you have bench airflow data and cam specs for the motor's top end it gets closer, but my experiments still show it to give a narrower power curve than what reality delivers on 4 valve DOHC motors with long strokes.

I hear Dyno 2003 (http://www.motionsoftware.com/dyno2003prodpage.htm) is much improved, for example they finally have ramp rate data input for the cam specs. I've been thinking about purchasing it myself.