I agree with JaneQ. You're not going to change, you know that. #2 isn't going to be happy with the person you are so I don't see a lot of future with him unless he can accept you as you are.
I was one of the guys is a situation like yours, and I was the guy who was okay with it. She ended up marrying the other guy and getting divorced a year later.