If you're going to do 7, there's no reason not to do 8. Make it a mutual option year and structure the pay schedule in a sine curve. Something like 30, 32, 32, 34, 35, 34, 32, 32, 30 *(option year)
I find it hard to believe Machado would get a shorter contract than Heyward unless that is what he is looking for.