we once had a similar problem and we found that riding just in walk was the best approach in the end, as we could control everything and there were no risks of further damage through turnout.
I literally have 13 days before I have to perform a half decent piaffe, seeing as my horse decides he'd rather do spanish walk that piaffe this could be extremely fun-sarcasm intended. hahahaha