Cervelo also makes the RS, which has a taller top tube. It also has 650 wheels in the smallest size, allowing for excellent geometry. I'm 5' 4.5" and the XS would probably be the size for me. You might take the S, though.

Terry's Fast Woman is steel and has more aggressive geometry and a longer top tube, which might work well for you. You can buy a frame only so you could transfer your gruppo over.

I have a bike (Merlin Atreus) with 'aggressive' race geometry and I love it. I use about 20mm of spacers below my stem, but otherwise haven't mucked it up. I absolutely love its geometry and love riding it. Partly it's the material (Ti), partly the geometry. Responsive but not twitchy steering.

When I ride my Merlin I feel a lot more attached to my bike, versus my cyclocross bike (LeMond Poprad) with its higher bottom bracket, where I feel more like I'm riding on top of the bike.

I hope you have a great fitting!