Hello Dayton
Sounds like your at the cross roads, what to buy ?
Don’t limit your diving to your gear. I work at a shop that carries all the major lines, warrenty is extreamly important! some stores say they are authorized and lie ,look up the Manufacturer and ask them directly. In AquaLung the Pro QD BCD,Regulators TittanLx old style, you should be able to find it discounted,Computer Old style Vyper Wrist the only diffirance beteewn the new one is digital compass.
But for what you spend, consider the following
Zeagle Ranger BCD,Zena BCD for her they have Excellent warrenty and good price
TittanLX good performer parts program
Callypso Octo Good breather and inexpensive
ProPlus 2 computer Air integrated good warrenty easy to read.
hope this helps.
Hector