Taking advantage of our rainy weekends to do some wrenching I see! I'd say go with the Ulysses clutch cable if what you've done so far doesn't quite stretch. As far as that clutch switch wire itd...