If you're looking at dildos too, I would say BENT GRADUATE!!! Seriously, you can't go wrong with that one. It's extremely highly rated, (nothing below a three star review), and for 30 dollars as well!!! Even if you do get a vibrator, I'd still pick up the Bent Graduate. It's just that good. Here's my own review for it
As for vibes. I found that the Gigi found my g spot. However, if the Ella didn't work for you, I'd pick something else. I'm told that the Gigi is harder than the Ella, however. I'd suggest the G Ki. While it personally didn't work for me, it's highly rated and adjustable (which makes the chances of it working higher).
Also I'll second the Pure Wand suggestion. It's around 100$, but it's completely body safe, and luxurious. It has over 50 '5' rated reviews. I really loved it!
But it is quite expensive.