Do you have a powermeter? Xert might be something to look at. It models your fitness and "training" looking at all variable efforts. I'm testing it with my long commutes that are hard to do structure on. Works best if you still do some testing and intervals to lock in certain power durations