Hi there! I had a longer post typed out, but Chrome ate it.

Don't be afraid of the racing geometry. If that feels more comfortable, go for it, even if you aren't planning on racing. FWIW, I have no plans to race, and my next road bike will have race geometry--that's what fits me better. I feel scrunched on the more relaxed ones. Comfort and fit are paramount. I couldn't really tell the difference between the stiffer Amira carbon and the "plush" Ruby carbon.

Start looking now if you can afford it. Perhaps you'll find a sweet deal on a 2013 model since the 2014s are coming out soon. Just look for 9 or 10 speed cassettes to help get rid of that jump you feel.