I don't think you have done anything wrong (yet), but I think you should tell her to quit yanking your chain and stop copming to see you until she loses the boyfriend.