@RenAn This topic comes up in the forum from time to time. Here is an answer from the Coaches from another thread that might help.
Also I recall that one of the podcasts discussed this topic - might have been the one on strength training. I do exactly what you do with respect to strength so I think that is correct and I probably learned that either from the podcast or from another thread.