2019 Gen4 Radiator Cooling Fan: Replacement / Alternative

Greetings,
My Gen4 had the radiator cooling fan motor replaced by the dealer, but now the spindle on the fan’s shot and they don’t have the replacement part. Four weeks if I order through them. Any off the shelf alternatives? Perhaps off the Baleno? The dealer won't suggest a part swap and refuses to give me the part #. Any suggestions welcome ... my warranty is out and the makeshift swap my mechanic did is vibrating like crazy.

Think I found it:
17111-78R00-000

My woes continue ….. the “mechanic” is having some issues replacing the cooling fan. Some background: 

Fan motor replaced by dealer at end of warranty
Fan blade hub failed - perhaps due to poor fitment of shaft key
Dealer out of stock
Been running a poorly centered Toyota fan in the interim
Vibrates like crazy so haven’t been using AC

So how’s the fan supposed to fit? Is ring A supposed to rest on collar B?
If you don’t tighten the nut securely the fan wants to wobble. If you torque it down the fan doesn’t spin freely. Am I missing a part? Dealer didn’t have a washer between the fan hub and nut. Tried adding one, doesn’t help. 

Any inputs welcome …. it’s the end of summer but it’s still incredibly hot …. I’m melting!

The workshop manual doesn't show any spacers or washers fitted between the fan and motor.