Not a big fan of most of these suggestions. Royal Road drawing a card would defeat the purpose of royal road. Why not just automatically apply the rr buffs to draw if that was the case?

And you didn't even suggest the most obvious and effective fix that could happen to ast - shuffle being prevented from redrawing the same card.