i'd honestly do the buyback then buy an used CPO LCI.
1. i like the LCI look better
2. an 07 is probably out of the factory 4 yr/50k warranty or near the end of it
3. they might offer you more as a buy back than you would get for a trade / private sale otherwise. - more or less capitalizing on the opportunity that doesnt come up often