I think your fan / cooling system is ok.
If your fan comes on in traffic / idling / slow speed, it's doing it's job (the bike will naturally run hotter in these conditions due to lack of airflow through the radiator).
At speed, the fan shouldn't come on because there's airflow anyhow.
On my 600, the fan kicks in about 100C, and cuts out around 95C, normal temp at speed is high 60's / low 70's.