I said I was gonna put together some workflows for this and I think I have this working fairly cleanly. These are the steps I am performing:
1. Remove any snapshots
2. Consolidate disks
3. Backup original .vmx just cause
4. Scrub cloud.uuid in vmx (set the value to empty)
5. Unregister the vm from vCenter
6. Rename the vmx and the directory to the computerName of the vm
7. Register the vm but place it in the clusters base resource pool.
8. Reconnect the nic to the proper network and set to connect on startup (seems to lose this for some reason).
For me this seems to be working well. The disk consolidation is the only thing that really takes any length of time. The result seems to be a broken vApp in vCD I can simply delete and a new vm still living on the same cluster. If I really wanted it totally clean I could also do a svMotion to clean up the vmdk's but honestly I can live with them having names which don't match for a while. Its likely at some point we will move to new storage and they will get renamed then.
If anyone can think of anything I might have missed I would appreciate the feedback. Also if you would benefit from this workflow let me know and I will post it once I have cleaned it up and tested it a bit more.
Paul