Have you tried IntelliJ? I honestly do most of my SQL in psql, out of habit. But I'm in IntelliJ all the time for Java, and from what I've seen their query editor is way impressive.
Jetbrains are really kicking some goals.
Scratch file with a quick query in about 2 seconds is amazing