Orrn's Limited Item Upgrade Choices

I'm personally very worried that Orrn's champion synergy will be heavily dictated by which champions synergize well with his item upgrades. There really should be more options in order to allow his synergy with champions to be determined by the rest of his kit rather than the stats he gives.

An example I'll give is Kalista. Obviously, he won't synergize well with her because he focuses more on late game teamfighting and Kalista is more early game focused. However, she would also prefer having an upgrade to Blade of the Ruined King, for example, rather than one to Infinity Edge. Champions like Sivir or Ashe artificially have better synergy because they work well with Infinity Edge. Their natural synergy (good for teamfighting, scale well) is masked by the artificial stat synergy his passive creates.

I'll give a more extreme example as well. AD assassins will not work well with him at all because he does not give them any useful upgrades.

The solution I propose is to simply offer more options so that all champions can have useful upgrades. Important options should include the current options, plus Blade of the Ruined King, Randuin's Omen, Dead Man's Plate, Spirit Visage, Adaptive Helm, Youmuu's Ghostblade, Duskblade of Draktharr, Nashor's Tooth, and Liandry's Torment. I obviously missed a few items, but the point is that there should be enough options that all champions should have core items that can be upgraded. Core tank item choices also shouldn't be skewed by Orrn's passive, since it destroys the point of situational defensive itemization.

TL;DR It shouldn't be his passive upgrades that determines his synergy, but the rest of his kit. More item upgrade choices should be added to Orrn's passive.