Small update. Put an M3 cluster in finally and made a convertible BMW badge fit the steering wheel. Looks a tad too big, might change it for something else.
I even managed to screw the cluster in all the way with the stock holes. Just had to Heman it in there because the cage is in the way.