That was a Templar (Oath/Arcanist). Zantai said in a stream a while back that he thought Warders (Soldier/Shaman) and Warlords (Soldier/Oath) would be vying for the most tanky class once Oathkeeper was available.
Yeah, game is pretty big now. People complain about having to do 3 runs, yet keep asking for a 3rd expansion.
Of course you can now skip difficulties so don't have to do all of them, but for those of us who like playing all 3 adding yet another expansion would make it really long to get through.