A hitch assembly is disclosed for use with an articulated mobile machine. The hitch assembly may have a yoke portion, a tube portion, a driveshaft, and a hitch carrier to rotationally support the driveshaft inside the tube portion and having a plurality of first holes. The hitch assembly may further have a plurality of fasteners to connect the hitch carrier to the tube portion via the plurality of first holes, and a thrust collar to threadingly engage a periphery of the hitch carrier and having a plurality of second holes. The hitch assembly may additionally have a locking plate with at least one pin to engage at least one of the plurality of second holes, and a plurality of third holes to receive at least some of the plurality of fasteners. The number of the plurality of second holes is greater than the number of the plurality of first holes.