A fuel management aid, Power comander, SE Race tuner, TTS or the likes will defnetly help both with the overheating and most likely give you more Tq. & HP. The key is a good Tune(er)
Talk to Jammie at Fuel Moto USA even if you don't buy from him (which I would)
With your set-up you could get a canned map, but IMHO it would be well worth it to do it right and have it mapped on a dyno with a good tuner.
Also of note: If you are thinking of Cams, Big Bore or any other mods do it all then get it mapped so you save remapping cost.