I think finding the distorted pickup line my be the best thing to come out of removing the tank, sounds like the 16oz will be fine. You should always have a stiff section on the pickup line to prevent it bending forward. I have a friend who found stainless springs that fit over the line that works fine.