Better brush palette management

I have over 800 custom artistic media brushes that I use regularly. Currently, it's very cumbersome to manage them. Not only can I not easily create folders, the drop down doesn't seem to have any logic in the order the brushes are shown. Also, having the brush names available and searchable in the drop down would be great!