Chi,
I think You'll be doing fine if You just get some depth training. going out there and doing a couple of warmups and one deep dive a day will likely get You there easily. Increment depths by one or two meters a step every other day or whenever You feel that You can reach Your current PB comfortably - this might take longer than two days, don't worry.
You should stop the weight training so as to not slip into overtraining. A max dive a day doesn't sound like much, but does put some strain on Your body.
P.S.: Sorry for hijacking Your thread. We're all Yours now.
