I'd have voted Ella, but I see she didn't really work out that well for you. I've had one for several weeks now. There's a bit of a learning curve, but when I use the Eroscillator (with the soft finger attachment) and the Ella at the same time, things are working out well.
So now that you've had Ella AND Gigi for a while, do you still find yourself preferring Gigi? Or did using Gigi help you develop an eventual appreciation for the similarly shaped Ella?