Rivera coming back next season. As much as I liked the Soriano signing and it basically saved our season last year I actually think the Yankees should let him go. Bring back Joba with the arbitration and he and Robertson are the insurance policy/setup men in case Mo can't get it done for 1 more season.
Justin Upton on Arizona would be an incredible fit for RF. He's been in trade rumors on and off for a while now. Depending on what they can do, I would have no problem rejecting Granderson's option and playing Gardner in CF. Having an A+ defensive CF, and a guy who can steal 50 bases would be an incredible plus for this team.