Agreed w moving one of your 3B. Gotta upgrade from Tadahito as well I think. Conor Jackson I am high on, think he will be a great producer. And I know Willy is there for steals, but I've just never been sold on him. Those are the weak points I see.
Myself, I'd try to move Peavy and/or Oswalt for some bats and lesser pimped, though equal pitching.