What I would recommend is
1. two sources of breathing gas
2. two means of regaining neutral buoyancy (don't sink!)
3. two means of reaching the surface (lines, ropes, bottom crawling, compasses, optimal weighting, droppable weights, ...)
4. two means of doing mandatory decompression stops, if...