No interest in FEA? If not, I think your plan is fine and its what I would do. Soarin was relatively easy for us to obtain as a 4th FP and the wait times were manageable at different points during the day. The addition of the third theater has really helped.
If you are interested in riding FEA, I would book a FP for FEA and rope drop Test Track. Try Soarin after TT or try to pull it as a 4th FP later on. My reason for this is because if you were to rope drop FEA, its quite a long haul back there - especially at a brisk pace. And you likely would be beat to the queue by those coming from Akershus breakfast and entering through the IG.