I hate to rain on everyone's parade, but this trick, as beautiful and awesome as it is when it works, has a flaw that makes me doubt that I'll use it anymore.

After the card is selected, you return the deck to the spectator to shuffle. Everything works perfectly if they do an overhand shuffle; but if they do a riffle shuffle, the final reveal at the end of the trick usually ends up with the wrong card. That has happened to me several times, and it really does ruin the trick. The only way around it I've considered is to specifically ask the spectator to do an overhand shuffle and give them a demo.
Any thoughts?