As for the lessons learned... I can't do anything about the old schema, but at least I can do something about the new schema:
(and I have an idea for merging the old and new schemas. I'll be back on this thread with more detail if it works out)