To me it sounds like honesty would be the best. You wrote about how you're not comfortable with confrontation but I can't see anything changing unless you communicate your feelings to her. She may not even realize that she has hurt you.

I think your passivity is noble but also part of the problem. I say get your feelings out there in a calm manner before they force themselves out in increasingly negative ways.