I'd have taken the S-Works, too. It's nice that they're replacing the entire frame - I wouldn't have been surprised if they would have just replaced the fork, mis-matched paint job or not.