Sounds like a great plan.
The struggle I always had with EMH at DHS is that the rides are pretty far apart, so it makes logical sense to do RNRC and ToT and Fast Pass TSMM. (Still don't get why GMR is Tier 1).
If you want multiple rides of TSMM, I wonder if you can zip up there and ride it before your 9:20 FP.
My last use of EMH at DHS I was with a preschooler (so we couldn't hit RnRC or TOT, so we just hit Star Tours and TSMM (which was still a 30 minute wait during the EMH!).