FP+... Do I switch it up this next trip or keep with tradition?

[Queen of the WDW Scene]

Most of the time I go with my sister and we have certain rides we RD, certain rides we FP+, certain rides we don't mind waiting for, and certain rides we plain old don't care about going on.

My next trip will be with my friend who's touring style is slower.
She's leaving the FP+ picks up to me and now I'm not sure if I should go with what I always do or change some things.
Your thoughts?

I'm questioning Epcot and HS in particular.

At Epcot I would lean towards RD FEA, FP+ tier 1 TT, and wait in line for Soarin'.
Now I wonder if I should RD TT because its less of a walk, wait for Soarin', and make an afternoon FP+ for FEA. I'd be doing everything I want in FW and eating lunch before going to WS to avoid the walking.

At HS I lean towards RD RNRC twice, then TOT, FP+ tier 1 TSMM after that, and FP+ tier 2 TOT to get on it at least twice in a day with little wait.
Now I'm thinking RD TSMM, FP+ tier 1 RNRC (my friend tends to only like going on once because she says it gives her a headache), FP+ tier 2 TOT (but that means we would have to wait longer later in the day to go on again), FP+ tier 2 Star Tours (I can't stand this ride but she likes it so I'm willing to go on).

If the above wasn't too confusing let me know whether you think I should stick with what I usually do or change it.

 

[MickeyWaffles]

I think you could go either way on both but I think I would change your Epcot day but keep your typical DHS strategy the same (except only ride RnRC once if that’s what she wants to do).

I think the Epcot changes definitely make sense to appeal to someone who tours a bit slower.

 

[Queen of the WDW Scene]

I think you could go either way on both but I think I would change your Epcot day but keep your typical DHS strategy the same (except only ride RnRC once if that’s what she wants to do).

I think the Epcot changes definitely make sense to appeal to someone who tours a bit slower.

I feel like HS is just a hard park to avoid the back and forth walking with the show times and location of attractions so any which way I come up with keeps involving more walking than I'd like lol.
At least this trip I am not park hopping so we have ALL DAY.