I think your gut is telling you to do this for Magoo - and you should go with it. Especially since you feel good about the Vet.

You could continue with the draining, but over time would it have to be done more and more often?

That picture of Magoo says it all - he trusts you to do the right thing.