I replaced the tetter bolt with AN6-30 which seemed to be slightly to long. The clearance to the rotor brake is really close so I will order a shorter bolt to see if I can make it work.
I re-attached the upper control rods to verify the fore and aft angles.