Long endurance rides and max effort hills. I liked to do 4-6 X 8', max sustainable effort. One of those a week, the rest long endurance. My guess is that much of the issue is positioning. By now you know who likes to play. Try harder to know where they are. You want to be on their wheel, staying out of the wind.
__________________
Results matter