Might be a long shot, but has anything tried to fit the ER oil cooler in their Z4?
http://www.n54tuning.com/er-sport-oil-cooler.html
http://www.evolutionracewerks.com/node/133
it looks like just mounting and the optional shroud would need to be modified.