Warning: I'm in my "I hate guys" mode, so this may not help, but I do feel its relevant.

A guy should NEVER come between bestfriends. You (and her) should figure out if he's more important than your long-term friendship...