I played it wrong from the beginning but it felt a little less luck-dependent and more Euro.
Allow players to exchange any number of cards from their hand, not all of them. In this way you can actually plan something more. Give it a try!
The designer has stated here that he doesn't like this idea. Not saying you shouldn't, but there are reasons it may not work best.