Did i discipline her the wrong way?..young mother in need of advice!?

Well first of all you did not say her age. discipline does not have to be aggressive. There are a number of books in the stores and on line about this. Your boyfriend should have never taken her as if to protect her from you. That will make her think you are the bad one.