Level 17: What units?

[eXeel]

I'm now a lvl 17½ paladin. I asked earlier, at lvl 11, what units I should be having. Now I'm just done with making peace between Humans and Dwarfs, got an option to take to the Elven lands and I need to reconsider...
Here is my lineup:

1) Inquisitors.
I make these myself, so almost infinite.

2) Royal Snakes.
Between these and Griffins, these work great for me as a defense-offensive melee unit.

3) Cannoneers.
A little low dps, but I got the telescope with 100% more dps. Consider keeping these.

4) Shaman.
Tough and good dps melee, their ranged spell is great too, but only works every other turn, sadly. So not a pure ranged unit.

5) Evil Beholder.
Somehow I feel the dps of these are a little low, but might just be me? I have been glad for them the past 17 levels, especially their spell to "spend" a turn for an enemy ranged stack. Maybe I'll keep liking them?

As I just got a chance to buy the telescope, I wonder if I should replace Evil Beholders or Shaman with Bowmen or Hunters (when I can get them), since only they get the 100% damage benefit. But I really like my lineup!

What do you guys think?