MrT

Get a used Nikon 105mm f2.5 from eBay. Get the AI-s version made until 2005. Optically superb and built like a tank. https://www.dpreview.com/forums/thread/3933527 

I have both the X-T2 and X-Pro2 and I use them both equally but differently. You can find a lot written about the user experience online and I won't repeat it at length, because it matches mine:
X-Pro2 for people, cities, travel, or anything where discretion is a factor. It goes in a Billingham bag with the lightweight 23/35/50mm f2 lenses. X-T2 for landscapes, macro, or anything where critical framing and a tilt screen is important. It goes in a LowePro rucksack with a bunch of heavy primes. So the short answer for you is X-T2.

I have the 90mm and I am looking forward to getting the 80mm once I can justify the cost! From my experience of the 90mm, the best way of stopping this noise from being annoying it to store the lens upright when it's not on the camera. Gravity stops the magnets (?) from moving around when the linear motors are not under power.

Do you have the OIS on continuous (mode 1) or shooting only (mode 2)? Keeping it on continuous is not necessary and will drain the battery. The 16 and 35mm 1.4 lenses you own are not OIS so you won't have experienced this yet. You can find the IS settings under the Shooting section of the menu

Get a used Nikon 105mm f2.5 from eBay. Get the AI-s version made until 2005. Optically superb and built like a tank. https://www.dpreview.com/forums/thread/3933527