I managed to code the dash warning lights out using NCS expert, basically disabled cold and hot monitoring of the high beam. This also made the turn signals in the headlights behave normally again (ie not constantly on).
Also turned on the AEs as DRL at the same time
Thanks for all the advice!