There is no telling how Zimmerman plays when he comes back, and there is really no timetable on when JJ is coming back either. So I would have to go with Trade A, plus you get to keep Carl Crawford that way too.