Yes, buy that I19 wheelset and set it up tubeless. Maybe Hutchinson Sector 32mm. Nothing will every overcome the long wheelbase and sluggish geometry but shaving a pound off the rims and tyres is going to make it ride much nicer, esp upgrading to tubeless. Save the other wheelset from when you're hauling lots of stuff. All road bikes need at least one extra wheelset.