Thanks! Main shaft was my main concern but I measured it against a known good shaft (I know that sounds wrong but you know what I mean ;) ) and diameter is the same.
Ok, new countershaft it is. Cluster gear is fine as I use a different gear set with very low miles.
