I would do that and add on a tranny cooler. Also, do a ChrisFix super flush for the coolant system.
I put my Monroe Airshocks on (so easy to come off...no rust whatsoever and torques to 63 lbs) and did a superflush. (The old radiator coolant smelled like power bait.) Towed the Pontoon 30 min to my parents house this morning with no overheating issues and it was smooth sailing...like I did not even have a trailer in tow!
Tranny cooler will go on in the winter most likely. I may have someone put it on for me...I don't really trust that guy's youtube video. Doesn't really show you where to cut the lines. Plus, It looks like most kits are plug and play so there should be no need to cut the lines. I'm also going to do new rotors and brakes.
Where did you get your CAI? And how did you do the light bar on your tek? And if you have any luck finding a place that sells brush guards for our teks let me know!