Hi Mulefeathers,
The common advice is to wait until certified and perhaps a bit longer than that before investing. This in the hopes that you will get to try some gear and have some understanding of your likes and needs. That being said my wife and I certified in all of our own gear.
My concern in that it sounds like you may just be starting to get your head into dive gear, in that regard I had a 12 month jump on you, if I'm reading you right. Becoming gear savvy is in many ways more difficult than getting certified.
Go slow and don't buy until you understand features and pros and cons of different styles. It's a big investment and you don't want to repeat the process.
The good news is that by buying your gear you will have a consistent configuration and will be enabled to dive at will. The more you dive the better you will get.
Spend some quality time here and in the gear forums, there is a wealth of info.
Pete