M50d. I've made the change and I'm loving it. Just thinking about chipping the 520d and pushing it to 450Nm from 380Nm!
As a daily driver the diesel gives me more Joy than the M3 ever did.
2012 BMW F10 520d M-Sport
2010 BMW E70 X5 xdrive40d