Anyone tried to house rule that abilities that recover on a short rest recover between Encounters and abilities that recover on a long rest recover daily?

My concern is that the wording for some abilities gets a bit muddy and it takes away the players' agency on when they rest. Of course, it may also remove some arguments between Warlocks and everyone else.

Cantrips remain At-Will

Artificer - Daily: Spellcasting, Change Infusions, Flash of Genius, Spell-Storing Item

                  Encounter: Right Tool for the Job

Barbarian - Daily: Rage

                     Encounter: Relentless Rage

Bard - Daily: Spellcasting, Bardic Inspiration

            Encounter - Song of Rest, Font of Inspiration

Cleric - Daily: Spellcasting, Divine Intervention, Harness Divine Power

              Encounter: Channel Divinity, Destroy Undead

Druid - Daily: Spellcasting

             Encounter: Wildshape

Fighter - Daily: Indomitable

                Encounter: Second Wind, Action Surge,

Monk - Encounter: Ki, Dedicated Weapon

Paladin - Daily: Divine Sense, Lay on Hands, Spellcasting, Cleansing Touch, Harness Divine Power

                 Encounter - Channel Divinity

Ranger - Daily: Spellcasting, Nature's Veil

Rogue - None

Sorcerer - Daily: Spellcasting, Font of Magic

Warlock - Daily: Mystic Arcanum (all), Pact of the Talisman

                  Encounter: Pact Magic, Pact of the Blade Ritual

Wizard - Daily: Spellcasting, Arcane Recovery, Cantrip Formulas