Update: Got my 6WB working perfectly! (almost, still have to figure out 1 minor issue with CBS).
Navigation, Fuel, everything works great, can't thank everyone on the forum enough for their help.
Pics are below, you can see that with some black paint on the edges, the cluster looks quite a bit better in the F30 housing. Sorry the pics aren't perfect