I am going to suggest something similar but different. Many really good instructors offer workshops now. I would ask around on here who people suggest and take a workshop with whoever they come up with. This way it is tailored to you and not some cookie cutter refresher.
As for gear get a good dive computer first. One that will do all the dives you intend to do in the future. Once you have that then look at BP/W and thermal protection.
As for gear get a good dive computer first. One that will do all the dives you intend to do in the future. Once you have that then look at BP/W and thermal protection.