It’s hard to give you advice witout knowing how many day’s per week you are performing your routine, but if you would like to work on the more advanced moves without compromising your regular training you could try what Paul wade calls consolidation training, it is also known as greese the groove, staying fresh and I’m sure it has other names. Basically you would practice a difficult technique every day or every second day, and you would train multiple times during the day without going to muscular fatigue, this means you would perform only 2 or 3 repetitions at a time then wait until you recover and repeat.
Convict conditioning has a efficient active stretching program called the trifecta, all kavadlo’s book stretching your boundaries also has a lot of relevant information. Personally I would perform technique variants that require less strength and more mobility than the regular version, for example instead of push ups you could perform Hindu or dive bomber push ups, is will improve the mobility if your hip joints. I would also highly recommend bridges and their variants ( static for the morning warm up and dynamic for your actual training ). You could also perform joint circling for a more thorough warm up.