Anybody consider (has jumped) to Nikon D500 for Wildlife/Sports?

Hi guys,
I am playing with the idea to either get the Pana 100-400 or the Olympus 300mm F4 for Wildlife and sports for my EM-1.
While playing through the different scenarios and comapring reviews, etc. I can not help my looking over to the D500. Here is why:

• Amazing AF (EM-1 is no slouch but especially for BIF it is too slow sometimes)
  
• Superb high ISO (for an APS-C sensor). This is one of the biggest pain points for me of the EM-1. I am starting to see noise that effects the details around 400-600 ISO. That is something I also do not think the EM-1 ii will improve that much, maybe ISO 800 will become usable..
  
• Handling: I have the grip attached to the EM-1 90% of the time. And with it the EM-1 is almost as have as the D500 (without grip).
  On a side note: What annoys me with the grip is that when I have it activated there are many times where I accidently change settings when I shoot in horizontal mode because the bottom of my hand touches a wheel. Something that I have not had with my NIkon D90.
  
• EVF vs OVF: Hm, the EVF has a lot of benefits, fast action is not one of them. Too much black out time. The EM-1 ii might be able to address this.
  
• Price: The Pana is 1800 and the Oly 2500.   For a D500 with the 200-500 I would pay around 3300 USD. Including the EM-1 body (grip and 4 batteries to be able to shoot for a day out in the wild), I am close to that price (Pana) and over with the Oly.
  
• Weight. I think weight is a plus and a minus. Weight is a in favor for m4/3 when it comes to carrying it around or on travels where space is critical. But I feel that a bit heavier gear gives a better feeling while shooting. A very long lens that is light is easier to move and puts therefor more 'stress' on the IS.
  When all items are available I might get the 100-400 and test it against the D500 and the 200-500.
  I was just wondering how other people felt here.
  Thanks.