If shape is important to you then choosing a front closure bra with underwire will be the best way for you to go given that the role of underwire is in fact to shape (not support, as commonly thought).
The other benefit is that feeling of familiarity. If you’ve always worn an underwire it can feel or look a little odd without it. So sticking with it is one less thing you need to adjust to with a new bra.