Major fantasy overhaul, help?

TWO GUYS YOU MIGHT WANT TO LOOK INTO IS,2B B.J. UPTON FOR TAMPA BAY,AND SP RICH HILL FOR THE CUBS.HES GOT A CURVEBALL THATS AS GOOD AS ZITO'SW/EXCELLENT COMMAND.BOTH ARE PROBABLY FREE AGENTS IN YOUR LEAGUE