If you are not already doing so, I would add one or two friction sway controls to your present hitch.
If you are looking for a hitch with combined WD and sway control then the two mentioned earlier are good choices plus there are others like the new Blue Ox Sway Pro.
Barney
2004 Sunnybrook Titan 30FKS TT
Hensley "Arrow" 1400# hitch (Sold)
Not towing now.
Former tow vehicles were 2016 Ram 2500 CTD, 2002 Ford F250, 7.3 PSD, 1997 Ram 2500 5.9 gas engine