While I agree that Masterson right now would be the better starter, I am not very confident in his secondary pitches (while Buchholz's are very good). I think Masterson's stuff plays up better in the BP for the rest of the year. Plus, Buchholz's lack of FB command will kill him in the bullpen.
IOW:
Buchholz in rotation, Masterson in BP >> vice-versa