I've tried a few cupholder solutions and found that the Ultimate cupholder seems to work the best for me.
Ultimate Cupholder
Buy two and put 'em both on the passenger side.
Eagleday is probably your best bet if you want the non-smoker's insert. That's where I got mine.
Non-smoker console insert
Mark