If you decide to "stick it out and wait for the boyfriend to mess up" you'll be waiting in vain. You can continue your friendship with her if you want. But don't wait around for conditions to change...