Fit probably could be better, but when you don't have any specific complaint then how will we even begin to speculate? Do you like the position the Roubaix gives you? Get another Roubaix. Take your current bike with you and put them side by side to see if the same size frame today gives you about the same position of the bars, saddle and pedals as does your old bike.

If you are looking for another bike altogether, then stay focused on the position you want to be in. Again compare side by side with your old bike or at least be aware of the stack height.

Don't be tempted by the sexier looking Tarmac or other race frames that will put you in a more aero position, unless you know that you want to be in that position. It's really gross to see a race geometry bike messed up with steerer tube extenders and weirdly angled stems just to get back to the geometry a relaxed fit road bike provides.

You don't get to pick the size crank when you buy your new bike. It is what the mfr thinks a person riding that size bike should have. If you think you need smaller cranks then consider the smaller size bike if you are in the margins between two sizes of bike and they have different size cranks spec'd for them. If size crank means ring size, you don't get to pick that either. But possibly a different tier level of the same bike frame might have a different brand crank with different ring sizes.