You should focus on something efficient. Absolutely not electrostats unless you plan to change amps. I'm sure Ralph at Atma Sphere would suggest some very good pairings.
Based on the diversity of your music I'd suggest Coincident. You didn't give a price range but there are many models that can fall inside any budget.
Based on the diversity of your music I'd suggest Coincident. You didn't give a price range but there are many models that can fall inside any budget.