How recently did you upgrade?
My M3P got into a bit of a tizz one day recently where it was waking itself up every 30 minutes without fail, and it was nothing to do with Cabin Overheat Protection. As soon as I got sufficiently motivated to try and find out the cause, it just stopped.
One thing that might be worth doing, which I did with my car - though I don't know if it was related, was changing my Tesla password. This has the effect of basically invalidating existing tokens, etc, so if there is something out there causing problems that would be the first thing to do. Of course, you would then have to actually wait by your car to anticipate when its going to wake up, to see if it actually does...