My situation was very much the same, but slightly different. I did my multi commercial first, and then my single engine add on about 2 weeks later with the same examiner. My oral was the bare minimum of aircraft systems and performance. I planned a cross country, and we went over the weight and balance. He then asked about a couple of systems on the Cirrus. 25 minutes max. The flight was straight forward, just the manuevers that you listed and maybe a couple more. If you were able to pass the multi initial commercial, you should have no problems getting back up to speed in a single. Good luck!