Why not just keep things the way they are, naming your son as successor owner if he is not already named?
Interestingly, if you were to die after changing the beneficiary to yourself, the account could be withdrawn without the 10 percent penalty. At least that is what the tax law says. The IRS might challenge it as being abusive.
Joe