I would recommend leaving now. If you aren't getting what you want from a brokerage move on to the next one. Sticking around is only hurting yourself.