Oh my gosh, it was a really stressful 2-3 months where there was an incident almost daily. I was reluctant at first, but when he started getting enough sleep everything changed. He's back to his sweet self and have been thriving since.
To OP:
Also, I found myself starting to yell at bedtime which of course I thought I'd never do. I spoke openly to my 5 & 6 year old boys and told them I was struggling with it, apologized every time, and told them i needed their help. They agreed to listen better and we made a deal that if I went 30 days without yelling at them they got to go to the arcade. It made me not want to let them down so that we could all go to the arcade together. It took me a couple trys but it totally worked for me. I can't remember the last time I yelled at them.
Good luck, parenting is tough. And if you are feeling guilty about it it shows you care.