I ordered from liberty flights, fabulous company, and for 29.99 (after you push the top left hand button) you can't go wrong. I went a similar path, except I ALSO opted to buy the Joy 510Mega kit between the 510, and the big battery model, wish I hadn't. Buy the Riva 510, maybe also just to try buy a Joye ego-Tank atomizer, and a 5 pack of cartridges when you're placing your order, I think that will add $20 onto your order, but it will be worth it. Thats what I ordered from liberty flights, a tank atty/cart kit and fell in love with the simplicity, and ease of use, but I have all of my normal attys to fall back on as well. Most days you will find me actually vaping from two of my Joye Ego-Tanks (the Riva 510 is a clone of the ego, except the Riva is actually better, it has a bigger battery then my Ego's) plus I have a 510 filled with high test nicotine, for those times that I need just a little bit more umph.
I live one mile from the coast, and it took a week for my order to arrive from liberty flights, maybe it was 5-7 days, I ordered on a Friday, and I think Monday was a holiday, but it takes a couple of days longer since they are shipping from California, but it's worth it. Fabolous company, great prices, good products, I smoked between 3-5 PAD, and the ego/Riva is the way to go, and on top of that I found the tank addition to be my go to VAPE machine. Each cartridge holds a little bit over 1ml, and none of the wicking problems with a normal cart. If you have it in your budget add it onto your rica order, you won't regret it.
The day I got mine from liberty flights, I actually (within the first hour of using it) bought two new Joy Ego Tank kits. One for me, and one for the wife. She fell in love with hers too.
Sorry if I added more stuff to consider, but that's my experience, and for the money, it was/is the best option I found for now.
Good luck, keep the 510 you won't regret that either.