I would say that changing HD to check in/out of combat instead would be the best possible change ^^
Also as for people getting HD if you sit down to use a battle prep, that would only work if they stopped attacking you while you sit down, so no need for a gap ether, just let it kick in when you are out of combat (aka not attacked and not attacking) and it should be more then fine =)