I think you are on the right track. Our own kids can definitely be the ones who challenge us the most!!
My youngest is the daycare bully right now. She is one and a half, and has decided to mark her territory by being aggressive. I react EXACTLY the same with consequences, as I would another dck.
Jut be patient and consistent, and it will get better!!