Upgrade vs re-design, need help defining what my options are.