Turn 2v2 into 3v3 and call it skirmish or elimination.
Take away the ability and grenade spamming. Don't add unnatural BS to the game, leave it as a normal timed round , where last standing/score limit reached wins the game!
Essentially just what D1 had.
Dont try to fix or change SOMETHING THAT IS NOT BROKEN!