Have you tried setting a reservation finder search for a PPO BOG? It would save park time & get you on 7DMT before the rope drop crowd.
You have a 40 minute break between Splash and Pirates. Maybe put Big Thunder in there do save some walking?
Also don’t forget you can get a 4th FP as soon as you tap into your 3rd, so keep looking for more!