This is the solution that has worked with other 5 v 5 games; So this would work for Overwatch 5 v 5 :
Having 4 Roles: Tank; Damage; Flank; Support
By Splitting Damage into 2 Roles: Damage and Flank (Widowmaker is Damage, Genji is Flank)
This helps the Support Queue Problem and Oversaturation of Dmg heroes, and understandement of what to do with specific Heroes
The Queue is pretty much broken right now, you always get support and rarely damage, and It’s clear Damage heroes have 2 different playstyles, the Stay behind the team/With the team and do frontal damage (Damage), and Go behind enemy line and do stealth damage (Flank)
Cheers! 