Temps going up on the highway
 

My 04 1krr has started to act up temperature wise. As I'm riding highway the temperature will go up to 180, drop to 175, then head back up to 180. However if I drop my speed below 65 or so the temps will slowly and steadily climb up to and past 200. I'm afraid to run into rush hour traffic and have the bike running hot.

This is also on a "newer" motor I bought to replace my damaged one. It has 25k miles and I'm running 70/30 distilled water/coolant mix. The most I've done to it so far was an oil change. Should I swap out the thermostat and water pump with my spares from the other motor? (Which never broke 180 in low speed traffic)

Before you start buying parts make sure you've got all the air out of the radiator/cooling system.