Sounds like you're doing some good work and will have it sorted out before it's time to winterize again.

Congrats!

PS -- I used pressurized air to blow out the lines last winter, instead of pink antifreeze. Worked great, and no residual taste/smell.