I personally would drop Star Tours and just assume you’ll be able to get a same day FP. Then you could add in another ride on TSMM or ToT. Also, AS2 was easy to get a same day FP+ for us (14 and 16 Jan). TSMM was pretty easy too until later in the afternoon/evening. I think we rode it like 6-7 times with same day FP+.
Here’s a link to the trip report:
HS 2-day trip report