Yes, that sounds sensible. I know I need more hill work. I tend to let speedwork drop while I'm increasing mileage, to reduce the risk of injury, but now I'm at "maintenance" for mileage, I'll add some speedwork back in. Come the winter, I may be taking part in the local crosscountry league with my club, which should be good for me, I think.