You can get separate normal item and upgraded version in street brawl.

[helir]

Sadly I can’t get a proper image because the match replay crashes on the buy menu. The game offered me to upgrade cooldown reduction and extra charge. The cooldown got upgraded, but the rapid charge was added as a separate item.
Match id: 51704048
Time: round 5 item selection

 

[YellowOrange21]

The same thing happened to me.

IdMatch: 53650642

I received Enchanted Stamina Recovery, but I also kept Extra Stamina.


However, in the match replay, for some reason I couldn’t see Extra Stamina in my inventory.