Mike I was in the same position as you and others.
I was also doing 2 lengths at a time and resting for no real reason other than thinking I needed to. I did this for a year or so.
Then one day I arrived at the pool and said to myself enough of this. I am in the water for 30 minutes but spending more time resting than swimming. So I just got in and swam 4 x 25. After realizing it was not so bad I slowly started increasing.
This was before TI. Now in the same time I get a whole lot more lengths done with improved DPS.
So yes Mike, get more dedicated and swim more laps!