Good luck Veronica!
This will be fun to follow you through training and completion. I think you have a very good plan in motion.
I am w/ you on the swimming - It would take me a lot of work to speed up a little bit and to me that is not the best place to use my time and energy as my run is REALLY bad!
It sounds like you have the swim under control - as was said "you don't win on the swim but you can lose on it"
Again Good luck and keep posting
It's about the journey and being in the moment, not about the destination