I agree. I'd target the Nationals and Juan Soto and Wil Crowe.
I think Castro to the Angels makes a lot of sense too, but their farm is still wrecked and I doubt they'd trade from their major league roster. I'd love to sping some guys off, say... Fraizer, Soto, Montgomery, Adams, and the guy we get for Castro for Madison Bumgardner.
2017 roster something along the lines of...
C: Sanchez
1B: Bird
2B: Wade/with Torres coming up in May.
SS: Didi
3B: Headley
OF: Gardner, Hicks, Judge
DH: Ohtani
Bench: Fraizer, McKinney, Romine, Torreyes
Rotation: Bumgarner, Tanaka, Severino, Ohtani, CC
Chapman, Robertson, Kahlne, Green, Holder/Heller, Smith/Shreve, and German.