Those that have done, (or did at one time) the "hitch pin mod", did you flare out the bottom of the bracket to help guide the arm back into place? Is that even an issue?
Never had an issue getting the arm back into place, getting the holes to line-up to insert the bolt is another story. Gotta have some level ground and usually took a few tries moving the rig around to get it perfect.