If there was only single phase then perhaps there should be two days between declare and battle itself. Might be fair that defender could change the start time of battle up to 3h if they wish. Might be tricky to implement, but would be more fair.
---
I don't want to be the oneThe battles always choose
'Cause inside I realize
That I'm the one confused