seems you're a patient learner planning long periods. GREAT!
Just a thought: How about putting your rest-times into your plans too? And shave some seconds off every week. Start with every other rest; next week first, third... and so on...
And sometimes you should swim a pooltime "for yourself". Let the actual lap tell you the focus for the next lap. No more no less. No pace clock no TT no look to other swimmers. Stop, if the joy of it sneaks away.
Keep on with your good work!