I would suggest trying some other Cleo unpadded styles I think. I have the Med (in a different pattern) and it is slightly different to the others at the top and harder to get a perfect fit. You might like the marcie, millie, melissa, bella etc better. If Cleo shape is working for you another good one to try would be the Cleo Juna which is a lightly moulded balconette. I'd also consider the panache idina.
I like the Cleo unpadded ones and am a similar size - other bras which I like are Bravissimo alana, other bravissimo branded balconettes (the shape of the marguerite), Ewa Michalak (especially their s, SM and PL shapes)