As a warlock player the short rest thing is dumb. Just give unlimited i mean it worked with bed rolls in divinity 2. Who cares if people cheese it? makes the game more fun and if you wnt a challenge just play a hhigher difficulty that nerfs it to 1-2 per long rest or just doesnt let you use it at all...