Yes, that's how I'd do it also. Uninstall all plugins in the AdminCP, and then manually remove any files left behind in your ACP.
Yes, clicking the revert button revert's it back to the original vBulletin style, but you must manually do this for every single template (from what I'm aware.. there may or may not be an easier way).