You're on the road to happiness, one more tip.
Try a rubber grommet around the bottom of the drawbar tang after sticking it through the tender bar. Snug it up against the tender bar and it'll keep the drawbar from moving around. That may get the other 10%.