If you're confident the EWs are due to UT, I'd keep the first A the same after a bad night, depending on just how bad it was. My LO always needed his first A pushed and that, or gently extending in the case of EWing, always worked for us. I always ruled out OT as the cause of the EWs first though.
I've always counted the first A from WU, not when I got my two up, but I know some do. I think there's a difference between 15 minutes of a baby lying quietly in the morning, and 45 minutes of crying though, in terms of how tiring that in-between time is, if that makes sense?!
How old is your LO? Would you like to post a typical day for us to have a look? Or were you just posting about a one off bad night?