Bras similar to Freya Idol Allure?

I’ve been wearing the Freya Idol Allure bra in 36G for a few months and it is the best fitting bra I’ve ever worn. The cup shape is perfect for me and I love how it looks. The only downside is that since it’s a convertible bra, a few times the straps have come off while I’m in public. Now that I’ve been wearing it for a few months it’s starting to get worn out and I’m looking for replacements. Does anyone know of any bras that are similarly shaped and preferably not convertible/strapless?