Class Suggestions?

Since they made my summoner build useless I decided to perhaps try a melee build. I was thinking either templar or mara and I would like a build that will be capable of doing 70+ maps with great clear speed.

Any suggestions? I mostly stuck to summoner as it was my favorite class in d2 but this continual kick in the nuts is destroying my ability to generate currency...so perhaps melee will be a better option. I would love a beefy build that can kill anything in the game.

CoMK + Cyclone + Firestorm