She will cycle between loving and hating you, so that may be why you see some of the flirting.
One thing I notice is it seems you're taking a hard line stance. In the beginning, as my friend Mach would say, you have to eat a lot of sh it.
My approach with my wife is as simple as treating someone as you would like to be treated. She deals me anger, I deal her kindness. It's not about now. It's about laying a foundation so that when the fog starts to lift, she remembers how she was treated even though maybe she didn't deserve it.