Honestly, that's what I'd do. Only reason I went with the 1LT wheels is because at the time, my tires were brand new and it seemed a waste to replace them. Plus I didn't have the funds for wheels and tires
When I decide to replace both, I'll be going with light 20s as well. And keep the 18s with better tires for the track.