Drive mode selector

So my 2020 P250 SE will randomly drop out of any of the none standard driving modes and lock into comfort mode. I have to let the car shut down completely when this happens, and restart to get the mode to change again. Sometimes it will return to comfort within a couple of minutes, sometimes it's 20 minutes, other times it works normally. The dealership just replaced the selector switch, the test report saying the old one had an intermittent earth/ ground. The new switch hasn't made any difference. Anyone else experience this and get it fixed?
Thanks.