Perhaps I worded that wrong.
My suggestion turns cure I into Solus and Cure 2 into tetra 'when the cooldown hits.'
•Cure I is Cure I on your bar. When you gain a lily, it turns into Afflatus Solus. It turns back into cure I when you have no lilies.
•Cure 2 is Cure 2 on your bar. Every 60 seconds, it becomes tetra until used, and then reverts back to Cure 2 when used. You don't even need to change it's ability name, it could still just be cure 2 and Tetra becomes a passive that says 'every 60 seconds, Your next cast of Cure 2 is free and instant)
•Medica is Medica on your bar. When you gain a lily, it turns into Afflatus Rapture. It turns back into medica when you have no lilies.
Still have access to the 'base' versions of each skill, they just power up when resources and cooldowns are in place. The only reason I'm suggesting it (Though I know it likely would never happen because of other constraints beside their design space) is because of how similar Afflatus and Tetra are compared to the GCD versions. We've got Cure 2, and then two extra quicker cure 2s. Lustrate and Indom, despite serving a similar function as Solus and Rapture, have a differnt support function as Adlo and Succor so it wouldn't make sense to merge them into one button. But WHM's heals are just faster versions of each other.
It doesn't 'solve' the problem that we aren't using our GCDs as much but it would clean up our bars a touch. And it might have the placibo effect of still technically using your older skills.
