I was thinking the opposite - pick more bowlers, because they've batted better than the batsmen! Forget Warner and Watson, why not open with Agar? Keep Starc for his batting...
A bit more seriously...you'd pick Agar instead of Lyon in that scenario. Less penetration, but won't leak runs like Smith would and it would let Clarke at least a small amount of pressure on.