Both RC and Gavia would be a huge improvement, but if you go RC I think you should also take the final Motte climb out and put the emphasis on Mortirolo.  Don't care that much for Tzecore, though the original design was better.
Overall I'm still baffled by how tolerated the route is despite how backloaded it is and how much deliberate sabotage of good racing there is. Bormio and Asiago are inexcusable to me. And then you finally bring on Pradaccio but it's a million km from the finish too.
Before stage 16, we're lucky to get 3km of road stage action outside of the Strade Bianche stage.