Help choosing a calculator for licensure exams

I've been using to the Casio fx-991ES/fx-991EX calculator since high school, and I was hoping to use it for my engineering licensure exam in my country. However, some stupid kids bought some modified calculator to the exams and they got caught. They've now updated the list of allowed calculators, and I'm having a hard time choosing. I'm getting drawn towards the fx-350EX/fx-82EX since it has a familiar interface, but it lacks the solve functionality I've gotten very used to. I'm also considering the TI-36X Pro, but I'm still on the fence since I've only ever had Casio calculators before. Any thoughts on what my best bet could be?