I have uploaded a new collection of the NPI with corrected locations for 9 sites based on community feedback, including every comment in this thread.
Looking forward to receiving many more corrections once these changes make their way into the community layer.