Doff and Don is not part of the required skills list. The surface swim is not optional. From the
published standards for SDI Solo:
Swimming skills
1. 200 metres / 600 feet surface swim in full scuba equipment, configured for local diving conditions; must be non-stop and performed in an open water environment
Scuba skills
1. Demonstrate adequate pre-dive planning
2. Limits based on personal gas consumption
3. Exact dive and/or no-decompression profile
4. Properly execute the planned dive within all predetermined limits
5. Equipment configuration appropriate for solo diving a. Streamlining equipment b. How to use and carry a redundant air supply
6. Proper descent / ascent rates
7. Proper safety stop procedures
8. Monitoring of decompression status equipment; tables, computers, equipment
9. Navigation skills
10. Demonstrate proficiency of navigation with compass
11. Demonstrate emergency change over to a backup regulator or bailout scuba at a depth not exceeding 30 metres / 100 feet
12. Deploy surface marker and use of surface audible signaling device