To improve your run, add in more sprints. Do more 400s and 800s, those will really boost you if you're training with the proper intensity. Fin swimming...