Sounds as if the two of you can't live with each other, but can't live without each other, either. Have you ever read up on co-dependency?
I don't think you can go wrong when you pull back and focus on self-improvement. But, you have to be able to detach, and that seems to be your biggest problem.
Don't sweat the small stuff.....like if she waves or not. You make too big a deal over that and it causes you to look weak. The more self-confidence you have, the more attractive you are. I'm not talking about the conceited type, but a healthy self-confidence where she sees you strong within yourself and not needing her to complete who you are.
It is not about what you feel should work in your M. It is about doing the work that gets the right results. Do what works!