If your style of riding requires that you may spend a few minutes crawling around in 1st gear and then a few minutes of riding above 30mph, increase the cooling system capacity by another gallon or so.
The increased capacity will have to be inline with the coolant that is constantly circulated. The new tank will have to be cylindrical with rounded ends so that it take at least 30 psi.
Increasing the coolant capacity will take it forever to warm up but will help the overheating issues during those brief periods of low speed riding more than a larger radiator.