I think that your idea to fix yourself first is the best. I should do the same. I am in a committed relationship right now and we're having problems because of my perfectionist tendencies. I hope everything works out for you.