There's 3 big providers of low cost "passive" indexing funds: Vanguard, Fidelity, Schwab. If you have a strong preference for any of the 3, all of those are good choices. At Fidelity and Schwab, you need to be more careful because they also offer more expensive funds.
For example, Vanguard Total Stock Market costs 0.05% when you have $10,000 to invest (admiral shares). That compares to 0.59% and 0.60% you currently pay every year. I don't know the exact timing of your 2012 purchase, but Total Stock Market has earned about +80% since 2012-06-1 (which would turn $25k into $45k). Roughly ~85% of active mutual funds fall behind the S&P 500 index over time. Your odds are better with index investing, and the annual expenses are cheaper. The problem? There's no money in advertising it.
If you're investing in taxable, you might look at a tax-exempt fund. At Fidelity or Schwab, "MUB" is a municipal bond ETF that's popular. Vanguard has it's own selections that include state specific funds (like for CA, NY).