Imo i'd also keep the 3A-3T, since quads are still not allowed in the SP, having the 3A gives you a significant bonus for now and for the future. I'd maybe rework the entry with something easier, since in Ladies you're going to get high GOE for a 3a anyway if you land it.
But Davydov always change layout of the programs, from competition to competition and while it maybe helps skaters to try different elements, it hurts consistency and the muscle memory.
If Samodelkina kept the exact same contents of her free skate in Russia with the quad lutz and 2 quad sal she could have won here.
Why watering down when you are 5 points behind, and you're in no danger of losing that second place and your competitor only has one quad toe?