Leonard's deal will only hold up this year. After that it doesn't matter. So yes this year he def wont "sniff the deal" next year with higher cap and if he improves that might be his deal.
The ceiling for one year is usually closer to the floor the next year.