I don't think I would tinker with the #1 and #2 spots. Castaneda seemed comfortable there, and took another across the board step up - career high BA, 2B, BB, OBP, SLG and Runs. He's a step away from being a .400+ OBP man.
Kitt slid into the #2 spot and had the finest year of his career. He gets on more than Dave (at least until Dave kick ups his BB to his potential), but he also hits more HR and 2B. There's more value in his midrange EBH talent coming up after Dave rather than the pitcher.
Castaneda, Kitt and Kress all responded with career years with that 1-2-3. While Kitt isn't likely to top his 1950 season, Castaneda and Kress have more potential in them. In the case of Kress, this is pretty fightening. We forget that he's a *10* Contact now. Kitterman hit .360 while an 8 contact last season. Kress actually has the ability to challenge .400.
BTW - did anyone notice that Kress stole 17 bases in 18 attempts last year? He's not fast at all. But he is a smart baserunner.
I wouldn't crank him up high in attempts. But he's now a 58/18 stealer in his career, on top of everything else he does.
He's 20 HR away from entering the TWB Career Top 25 in HRs. After that, he scales the charts fast.
John