Lots of thoughts on HS… (Here are our days: HS report)
Jedi Training: We signed up after RDing some attractions. I want to say we signed up for it around 0830 after we did Star Tours. I can’t really remember. The main point is that you probably don’t have to do it immediately at RD (even if you wanted that first 0940 slot though who knows). Then you won’t sacrifice more waiting time in the MFSR queue. Also, my 11 year old son enjoyed Jedi Training even though he was initially doing so his sister’s (age 6) confidence would be bolstered.
MFSR: We RDed this on our 2nd morning and did pretty well getting off at 0753. The line behind us was substantial. It got up to 130 minutes at 0730 (MFSR wait times on 16 Jan 2020). At 0709 there were observed wait times of 80 minutes. It paid to be in the ‘front’ (not really as we got in the RD crowd around 0630). Stopping to sign up for Jedi Training easily would’ve put you in that 2 hour queue. All that said, with the changes coming to HS by your May time frame (MMRR, FP tier changes) it remains to be seen how it will affect MFSR at RD. I imagine the wait will still be substantial.
Same day FPP availability: ToT was definitely more available than either TSMM or RnRC. I’d try to move up your FPP (which I think will be possible when they change park opening time within the 30 day window). I think you could wait 5 minutes instead of 30+. Really, I think you could probably get SDD or MFSR as long as you get TP updates on days you’re tracking.