M.O.
I don't have any suggestions, sorry(!), but I do want to respectfully sound a note of caution.
In our society, we tend to celebrate a lot of behaviors in boys that we won't tolerate in girls, and vice versa. But every woman, at some point in her life, will have an experience that made her wish all the noise and physical rough & tumble hadn't been scolded out of her system.
So, instead of the lesson being "X behavior is not okay," I really recommend making the lesson "X behavior is for X situation; in Y situation, we do Y."
I hope that wasn't too harsh or alarmist; it sounds like you and your husband have a chance to raise a wonderful, brave, free-spirited young woman -- as long as you let her roughhouse *sometimes.*