As of right now you just need to be worried about the CFA and doing well on that. Look up the requirements and max out on as many of those as you can.
Broaden your training. Swimming is great for overall conditioning. Join the swim team, or a swim club. Everyone should lift weights.
I'd be running 3 miles a day 3-5 days a week. Get that run down to 18 minutes. It's not that hard I used to do it as a DT in football. I may get criticized for saying this, but at the end of a run if you don't feel close to puking you didn't run hard enough. I didn't say you should puke, just feel close to it.
Mark your 3 mile run in half mile increments to stay on goal. Get a cheap digital watch with a stop watch function.
No offense but at your age getting in shape is easy and there should be no excuses.
Work hard and good luck. The above is just my opinion, but it helped me walk on to a semipro football team many years ago, and I was a starter by halfway through my first season.