The Treble II's are good but I mainly got them for commuting/day-to-day, the Kaos' will be for summer/'weekend best'! Didn't think using bright yellow shoes in miserable muddy winter conditions was the best idea!

The mavic's are a good shoe, they were on my list - the Giro's won as they can fit SPD's if I go back to them for some reason...! What are you riding with now?
I've not switched to SPD-SL pedals yet. I was tempted to wait until the days are longer and I do more social riding - although I will probably try them on the Turbo first for a few rides to get them setup correctly!
Try resting your quad for a bit - it could just be a slightly torn/tired muscle which needs time to heal rather than constantly trying to 'recover' from riding? You could look for some basic stretches/exercises to focus building some additional strength/stamina with it.