FTFY and Agreed and the only thing I can see now is Big Market vs Small Market ... which the Leafs essentially gave the middle finger to Bettman with that ridiculous signing bonus when Bettman essentially told teams not to do throw out those kind of signing bonuses heading into the next round of negotiations.
Strike vs Lockout is merely a technicality, bordering on semantics.
Also, I don't see big vs small, if they were going to fight that fight, we wouldn't have lost a season and a half because the owners wouldn't have had the necessary solidarity. The current setup has been very beneficial to every team, even and perhaps especially the Toronto types, who despite revenue sharing, are making more money today thanks to having cost certainty.
Lastly, the Tavares bonus isn't about market size, it's about exploiting tax loopholes. And I can't see the league having a viable plan or even a necessity to address income tax, and the players have no incentive to address it as far as I know.
Escrow, the escalator and Olympics are the battles that could, but not necessarily should, be fought. Hopefully the two sides can tweak things a bit without looking for any major overhauls.