Agree with the OP.

Suggestions
- Make it so Shuffle doesn't draw the same card, this would help a lot more.
- Maybe make a skill that switches to cards to their opposite, switching Bole to Balance, Ewer to Spire, Spear to Arrow, and vice-verse.