I agree with your decision. Stay faithful to the current woman you have and only choose to be with your old friend should your current relationship end for reasons other than pursuing Girl A. Also, there is no "friend zone," there is only the delusion that women are even interested in the first place.