As general anesthesia would be involved either way, and you don't have any guarantee that the aspiration would be a permanent solution, I would probably opt for the surgery. This way you can schedule it when it would be most convenient for your son so the surgery and rehab would have the least effect possible on his (and your) schedule.
Hope all the input you receive can make your decision easier.