You may get lucky with the Magical Express. We didn’t have to wait too long but we were disappointed to not have a real Magical Express. I’m sentimental and knew this may be the last time we’d take it with all of the upcoming changes. If in 2022 it is strictly run by Mears, I’ll be skipping it based on what I experienced this time. Just know that you may get the classic Disney experience or you may not.
ETA: Have a great trip!!