I left out XIV Dark Centuries and Wolfchant thinking they might be too much at that fast and happy end of the spectrum like Korpiklaani. but they're wicked bands in general.
I just got back from Vermont. Again thanks to Seditious, here are some more bands that I've found that I enjoyed, so they may be more clearly specify what I'm looking for.
You should give Borknagar's second album, The Olden Domain, a chance, since I know you like the debut. It still retains most elements of the first album. If you rediscover that then The Archaic Course is worth a shot too.