Oh yeah, I'd also nominate STS-131 for inclusion as an add-on mission. 3 EVA's, and a Ku antenna failure leading to a late inspection while still docked to the station...some pretty tight RMS clearances, from what I hear. That'd definitely be a challenge to pull off.