Just a little update for anyone who is interested. I've come to the conclusion I have huge decisions to make. It's not just questions about this girl, but questions about life. Instead of closing the door on her completely I've just acted the exact same with her. I'm always friendly, always smile and continue to be the guy I was. On the inside it may be a different story, but she doesn't have to know it.
Anyway... She's been a bit more physically flirty but not overly much. I found that a bit odd. She would walk by me at work and throw some play punches and then run off and have me go after her. I played along for a bit since I normally would, but after awhile I was just doing the smile and nod. I also heard her talking to some girls about how her perfume tasted funny... And I asked her what it tasted like. It was on her neck and she said I could lick it if I wanted to see.

Normally I would have taken that as a signal or flirtation... Now I'm starting to realize she's really f*cked up in the head if she would tell me off one weekend, and then be asking me to lick her neck by her ear the next.
Anyway... Have a great week all.