would like to improve bike leg this off season

I'm a 54 year old male I did Fl Ironman in 2010 then took off Nov. started P90X  Dec 1 did the full 90 days and then a two month hybrid that added Tri sports over the two months from that I had a great season doing sprints and oly races. I finished with Chicago in sept. (O.A. time 2:35 bike ave. 22mph on a very windy bike leg) This coming 2012 I would like stay at the sprint & Oly distance but focus on improving my bike leg. Early season May and June this season I did 4-6,  3 min hill repeats once a week for 6 weeks then starting mid June the meat of my training is a 30 mile group (4-5 guys) ride on Tuesday night where we  pace line 10 miles at 25-27mph.  I bought a new Cervelo P3 for the coming season and plan to be fitted to the new bike in Jan. My plan is to start another P90X cycle next week and add 2-3, 30-45 min trainer work outs rides (live in Indiana) a week to that through out the off season. I plan to then add 1 running and 1 swim work outs  back  in to the mix in Feb. and use the hybrid I used last year to get back to full tri training in April this season. Any advice on my plan, sound like I'm headed the right direction?