Hi Marc,
The Upgrade Geodatabase too will be the best approach. This tool allows you to maintain all of your geodatabase objects such as domains, subtypes, relationship classes, etc. Also, if you are using an SDE geodatabse, the Upgrade Geodatabase tool will maintain all of your database users, groups, privileges, etc.