You would be happiest in an STi.
I’d keep the civic as the winter beater and drive the STi when it’s not winter. If the civic won’t make a good winter beater, then Go for the wagon, but you will never be satisfied, you’ll start modding it and pretty soon you’ll be right back in the same boat as you are with the Civic.
The STI can stay practically stock. Intake, ehaust if you absolutely must but that’s it.