Any suggestions for a better steering wheel than the OEM square with MF buttons for my 04' X3?

Has anyone made a conversion and been happy with the result?

I've got this steering wheel in my 06 X3 Sport.

http://www.bmw.com/com/en/newvehicles/x3/x3/2006/allfacts/_shared/img/equipment_msport_steeringwheel.jpg

I'm also looking into swapping my 06 square heated steering wheel with an 08 3 spoke (the one that has the chrome at the bottom). Does anyone know if it will work?