Your plans for scuba's care are good.
Poor Winston!! I have airhead Pekin drakes that get into similar scrapes as winston. One got himself stuck through the bars of a dogcrate when trying to get at the drake confined there.
How to manage Winston's current issue. Yes keep him quiet and under...