There's no particularly good solution, just a lot of bad ones the players will almost immediately retool to nullify if they see it.
The dual rest/recovery cycle will work against you, simply remove short rests entirely because the problem is the class design and ease of using them. Swapping...