I think the selection of items for Ornn's passive is poor

Here's the list, for those who don't know:

At first, this seems like a reasonable selection that covers a wide variety of roles. In fact, you can almost match up the items with a particular class. But there are a couple of problems I have with this selection of items.

The first big problem is the selection of Deathcap as the sole Mage item. In just providing a pseudo seventh item, Ornn's passive already ridiculously favors lategame oriented champions and teamcomps, but the fact that Deathcap is the only AP item that can be upgraded amplifies that further. If you are one of the very many mages who do not tend to get Deathcap (because its a pretty bad item most of the time), then this kind of screws you. You have to choose between using a subpar item for your champion and giving up the utility of another item or just not getting the benefit from Ornn's passive. This feels like a really shitty way to get Deathcap to be more relevant than it currently is.

The selection of IE and no other standard ADC items feels kind of similar, though at least with IE there are more clear alternatives in Trinity Force and Cleaver.

Tell me, what is an AD assassin supposed to upgrade? Cleaver, obviously, but that kind of defeats the point of all those changes Riot has made to push Cleaver away from assassins and carries towards fighters. In the theoretical future where Riot actually gets AD Assassins to stop building Cleaver, they'll be left with nothing to upgrade should they find themselves on Ornn's team.

On-hit carries also get left behind here. As much as I hate most on-hit carries, I have to say that its really kind of bullshit that the primary carry classes get upgrades for their big-ticket scaling items while Rageblade is left out of sight.

My problem really boils down to this: The current selection of items is limiting to an extent that the question of "Who is good to pick with Ornn" is really "Who uses these particular items well?" rather than "Who would benefit from a 6.5th item?" For example, you would think that Kayle, an ultra-lategame champion, would be a great pick with Ornn's passive, while Draven, an earlygame champion, would be pretty bad, but really its the opposite because Draven has a great item option (IE) while Kayle doesn't, as she doesn't typically build Deathcap.

It would really benefit from two or three more items, particularly another option for mages, an option for assassins, and Rageblade.