Planning a trip during MNSSHP: what would you do?

So I have been working on those schedules for a little while. We are going during MNSSHP, but not attending the parties. Also, I really want to see HEA, so there were only two nights where the fireworks were happening. I booked what I wanted, got stuff to work. However, Disney updated the hours, which made me rethink the whole thing.

We are two adults, with PH tickets. This will not be our first visit. Last time, we stayed 4 nights and 5 days and the only thing I wished was more time in the WS. So this time, we are going 6 days and 6 nights. I have three versions on the schedule I like, but I would like some comments. My FPP is in 30 days, so I will start selecting then. We are going Sept 27th to Oct 3rd.

Here is the link to the final three schedules I am thinking of:

HS is a must do (ToT, TSMM and RnRC are in my top 5 rides), but I don’t do Star Tours. TSL is changing some of that, but I really only want to ride SDD and TSMM.

Thanks for all your help and comments!