Love them both. The first one also opens a gap for meta progression (unlock more shop items)
But the second one promises more randomness and I have another mechanic in my mind which nicely combines here
Thanks again!
Btw have you beaten the game?