I'm not sure there is anyone too familiar with E89 roof issues other than RobbiZ4 in Germany!
But Ross worked for Sytner for 15 years before he opened RBM Hampshire in 2019 so he is pretty familiar with post 2000 BMWs so may be worth a call. https://www.rbmhampshire.co.uk/