Planning a trip to WDW in September. Only going for 2 days - day 1 is MK in the morning and EP in the afternoon. Day 2 is DHS in the morning and EP in the afternoon. We really want to ride Soarin', Test Track and Frozen. Since we won't be at EP for rope drop either day, I can't plan on riding any of those 3 then, so we will need to FP+. Trying to decide which ride will have the most reasonable wait in the afternoon. I'm assuming it's a choice between Test Track and Soarin'. Which would we be better off waiting for and which should we FP+? I'm leaning towards waiting for Test Track because of the single rider line, but Soarin' wait times seem a lot more manageable now that the third theater is open. Suggestions??