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 be worth a shot to take the fly screen off and try to find some extra wire, but I doubt you'll find much extra. At least u can splice in some extra inside there and make it easier hide/tidy your splice.