I went swimming tonight after work in the very old and imposing Herschelbad. My plan was 2 km in 45 min and it was a tough start, cause the water was really crowded with kids, splashers and so on. But around 8:20 pm the people started moving out and I could stop criss-crossing the water. I even had enough power to accelerate significantly for the last 250 m. A completely new feeling and a very good time for me: 44:44 min. Now I can be pretty sure to be out of the water in less than 90 min and still reach my bike alive in August. :)
And if I manage to continue my regular training once or twice a week, I'm sure I can even do much better.