Actually, Wrath could stay as the original version. So, only a slight change to YSANC and a bigger change to Choke would give vader some indirect defense and movement; which he lacks.

The Choke's would give Vader some defense by way of freezing the opponent for a turn while drawing. Vader would still have 14 dd against majors but only 6 against minors; instead of the unheard of amount of 24; which is overkill anyway.