Warlock will still have 2 top builds minimum.
The herald changes are questionable, but guess we'll see. The direction is good, but it should also include some changes to other class skill trees that missed the mark in previous patches (looking at poison necro bugs/scaling, bladesin scaling, bowazon mechanics, nado/shape/summoning druid scaling, barb aoe/2h ww ias).