LostTrail61
Registered
IMHO, get more bottom time and experience. As tmassey stated, find a mentor, someone experienced you get along with, trust, that can help you get comfortable in the water. Work on the basic skills until they become muscle memory. Gain additional skills, watch the people you dive with, ask questions, be a sponge. Gear will come, but as expensive as dive gear can get, try before you buy so when you do buy, you're buying what you want and will serve your needs for a while.