By Valbuena, I assume you mean Valencia - who's fine against lefties, but awful against righties.
I agree with most of what you said. I'm hesitant about re-signing Cabrera. Not because he's not good - obviously, he is - but, more because, at this point, I'm pretty convinced the team needs to go in a completely different direction from how it's built right now. I'd consider trading him in the next couple weeks if a really solid offer came their way, otherwise, I think I'd give him a qualifying offer and take the draft pick. Same with Janssen - he's a good closer, but, closers are pretty replaceable and over-rated. I really feel like this winter is time to seriously look at trading Bautista. He'll be 35, so, he doesn't have a ton of years ahead of him, and, with his contract situation, he'd be very valuable on the trade market. The team just has too many holes to be able to fill them in time to have a good run while relying on him to be a key piece of the offence. It also wouldn't shock me if he asked to be moved - he was clearly not pleased with how the team approached the deadline, and I think he's really frustrated with the direction of the team (or, lack there of).