If you have only 6-7 hours a week to train during the school year, then I would say you need to start integrating some technical skills into your training now.
Looking at what you have done in the past I would suggest beginning some hurdle development and work in all the throws areas. Some of the work can be as Mike described.