You're lucky. Most of the noise is indeed the angle drive. I've spoken with several Polaris service people who acknowledge it off the record, and they say they are looking at it. I've rebuilt mine personally this winter, finding many problems, and am presently waiting for spring to arrive in the north country to test the results. As a motorcycle/auto tech for over 45 years, I can tell you the angle drive was poorly assembled.I'm posting my solution again. After chasing the whine, I finally pulled the cup holder and lubed the u joint. Problem solved.
FYI - my whine was only under load.