Yay for getting back in the pool! 40 minutes was the number that popped into my head as a target too.

I find that when I haven't been swimming in a while, the first two weeks are brutal, with maybe 1200-yd workout as the max I can endure. But then it just ratchets, the stroke drills have their effect, and bammo.

Good luck!