Keep the same system, but i like the salary suggestion. Bump up compensation to $10M/ 2 years and $20M/ 2 years. Adding another condition to make it so a player can only be comp'd once would be hard for Andy & teams to keep track of.
Los Angeles Dodgers GM