Pool training is great, make certain you have a partner. Lifeguards are notoriously useless if you blackout or Samba.
Try lap swims.... one lap on top, one lap kicking, one lap underwater.... or hypoxic training...
Like I said, don't push it without a partner. I know it isn't convenient but...