Just one more note , I didn't see much about it as I glanced through the responses. As a smoker, your tastebuds aren't really awake. A delicate flavor, like vanilla might be hard to taste right now. Put it aside and try again in about four weeks and see if it's any better.
I found when I started , strong flavors, caramels, coffee's and the like were what "tasted" best for me. While I love my riva, I'm not all that convinced having to purchase another pv would have been the answer at first. I have a 510 slim that I started with, and got the riva only because I got tired of switching out batteries every whip stitch!
Glad things are working out for you!