Updating Droid X running leaked Gingerbread to official release without root
There should be someone who has the official release that you can download and just upgrade like you did with the leaked version.  Like this post here.  It says it's for rooted users, but I don't see anything in the instructions that should require root.