I think triads are the hardest configuration to make work because a change in 1 person needs to have a change in the other two to stay in the exact same configuration. Maybe this relationship is somewhere between a triad and a vee. But that is not a bad thing. I think SeventhCrow is completely right about letting each relationship finds it own equilibrium.
It sounds like BF#2 is still mostly in this to be with BF#1. However, that does not have to be a bad thing unless he is trying to break you two up.
Who knows, maybe in time you will find BF#3 or GF#1 and things will change again.