This hits home, just went through this during my wiper rebuild.
With all the changes made already, I would remove the wiper arms from the studs entirely as you work to find the proper (original) clocking position of the small arm on the splined wiper motor shaft. Put a ziptie on one of the...