I'm eagerly awaiting my M3P too!
I ordered white/white with the Enhanced Autopilot upgrade on 28th March 2022
The order estimate currently shows May 2022 - it might be worth updating the table above in the thread to show if the EHP has been added and what impact this has on the delivery estimate?