Oh right, should have tried before writing that :) Played a bit more on my phone now and it does work great, and feels much more satisfying!
Regarding the end-game: maybe you could lean on the RNG, or start reducing the card pool, to make matches more likely over time? You do have a point though that the waiting is part of the game.