I just did both upper mounts on my 850.
Both were toast.
I've used a polly bushing on the engine end and the newer style at the firewall.
I always thought the firewall one would be a PITA to change, but once the cowl is off its a piece of cake.
Also gives you the chance to clean 15-20 years of junk out of there and install a cabin filter. (i got a filter but no holder :( )
I did find that the poly bushing was too large for my bracket, and it had to be cut on the outside to re-install the arm.
Complete looks like this: