I'm always willing to upgrade.
I do like your suggestions/style. Thats why I think I may like the one with the baguettes the most. It's essentially as solitare design with just a little extra flare. The straight solitare is a little too simple, imo.
Here is the biggest problem with the round solitare with side baguettes....The girl I dated in HS and college (total of 5 years) I gave a promise ring to of the same design (solitare with baguettes). Not sure if it'd be considered a little weird to get the same style ring.