1 year later - no regrets.
The only car I'd be swapping it for would be the 1M Coupe, but only due to the weight issue. I have a feeling the M3 may still be a better car to drive.
But compared to the 335i - no contest.
2004 Z4 3.0
2014 X1 28i ED
2015 F80 ED in June