How about start stretching out McCarthy with a couple starts and moving Vasquez to the bullpen. That way you'll get at least 4 and 3 innings from both and after a couple starts McCarthy can start going 6-8 innings.
This one or two inning outburst from Vasquez is getting old. 1-6 starters in the lineup with a hit would have helped too.