You're doing really well KG. The biggest thing for you will be swimming longer, getting the endurance to swim 500m straight eventually.

To give you some feedback; I swim about 18 to 20 strokes per length at tempo, I can get that down to 15 if I really slow down and stretch out. I'll swim 25 in 25 sec at a comfortable pace. But really 30 sec is very good and you should focus on endurance. It's amazing that you're doing so well since you just started with it all.