Building some strength and some power, then focusing increasingly on endurance is defo the way to go - with the laps etc sounds like you know what you're doing.
But I have read in several places (Self-Coached Climber, some article by Steve McClure) that you shouldn't do anaerobic endurance sessions (laps/intervals etc) more than 2 x a week for more than 6 weeks or so. Something to do with the lactic acid breaking down the muscle? My 2p anyway.