r&r....

Guys, can anyone tell me if the standard starter solenoid on the '06 factory is sufficient or would it be best to replace with an upgraded one from Griff?? Also, I've removed the brown connector at the r&r but did notice that after the bike was running for about 5-10 mins while I was warming...