I had the same problem for our trip next week. I've ended up scheduling F! on a night when we're going to be at a different park during the day.
We're doing MK, then early dinner at Cali Grill, then catching bus from Contemporary over to DHS and going to see the 10:30 pm show. Hoping it will work out for us! Maybe something like that would work for you?