Combat house rules suggestion

[Padre]

This bothers me too. Celestial combat comes up fairly rarely, but whnen it does I mostly either ignore this completely, allowing both attacking and moving on the same turn, or otherwise handwave the combat (because Celestial combat is super dull).