If the friend is seriously getting under your skin maybe just fade away from the whole thing . Most true friends finally come to realize they are irritating if you give them a chance to think about what they are doing . I have faded away many times through my life , a couple times I did not and things got ugly....I regret the ugly ones .