I think you are on the right track by moving more insulin up front. Certainly seems that way from your BG numbers.
This point is often overlooked, but think about it like this. What is your insulin duration, 4 hours? Every bolus you take is extended. They all last 4 hours! Even if you don’t extend it on your pump, if you take a normal 100% bolus, it takes 4 hours for the whole thing to come in, right?
I usually do all my meals 100% up front. Occasionally I dabble with a 30 minute extended, but that is only if I am eating over time. Usually I do 100% because food lasts about 5 minutes on the plate in front of me. 
I think going the other way - 75%/25% might work better for you. But play with it, change it, try it, adjust it, try it again.
Just like you did for swimming.
Make DM’s Pizza Thread and experiment! But start with 75%/25%. 