Thanks for the advice+1000
Learn to dive CCR - get comfortable and then take the CCR cave cert class. Regardless of being in MX or not. Learning buoyancy on CCR (all over again) will take time. And learning cave on CCR with from an instructor that can reteach techniques to help not stir up silt or hit fragile stuff will be super important.