Fuck, if Larian doesn't want to get rid of too many bonus action options, you could just have two/three shoves:
-Weak shove (Bonus action, but disadvantage)
-Strong shove (Main action, no disadvantage)
-Shield Master (All shoves are strong shoves, even bonus action ones, and main action shoves have advantage)
