The good thing about your Riva battery is you can do so much with it. If you don't like the tank or cone (I never use them myself), you can switch it out for something else.
If it leaks, try cartomizers or clearomizers, or dual coil cartomizers. You have to spend a bit at first, but once you find what works for you, you're good. There's not going to be any perfect pv out there. Just one that suits most of your needs the best way possible.
For me, and this is only me- I didn't like fooling around with filling cartos, and I'm not overly fond of clearo's or tank mods. They're OK, just not for me. It's more of an aesthetic thing than the way they perform. I haven't tried a ton of different pv's but I really love my Reo mini and my 5v box mod. The reo for when I want something small and I don't have to keep refilling. The box mod when I want a little oomph. If I'm walking the dog, I like my 510 mini. If I'm out in the yard all day I like the boge rev because it holds a ton of
juice and I don't care if it gets banged around. I only vape a couple different e-liquids and know how I like them and at how many volts.
If you vape a lot of different e-liquids, and you need a battery to last you all day or hate to refill, you may like some kind of vv tube mod and tank. Money's a factor as well.
The leaking, I don't have an answer to. I had an ego-T tank/atty and didn't have great success. Other's do. If you like the idea of seeing how much juice you have, you might like the clearomizers. They're easy to fill. I didn't have leaking at all. I liked cartos better, but the clearos work well.