Oversized fan and higher pressure cap should fix your problem with overheating. If you get a vortex they can program the fan to come in sooner. If you do engine work then maybe get the bigger radiator but the stick radiator handles a lot.
@jefftrumble4768 the bike runs good (and cool), I was the one overheating unfortunately. But I plan on doing some of those things in the future anyways!