There is mentioned anywhere in the USRPT documents the priorities for swimmers.
1. Technique
2. Mental skills
3. Conditioning
All your concerns with planning and periodization circle around the least important part. If 16×25 intervals are enough for conditioning then the question should be what can I do to improve technique and mental skills.