But overall I think you're right on both points. I've been wanting to add better support for modeling options for a while; for anyone who'd like to bump priority there, feel free to upvote this item in changemap: https://changemap.co/projectifi/projectifi/task/5735-better-...
For #2, I'll do some thinking to gauge level of effort in rigging up a mechanic like that with the current stack. Losing data sucks, and I should take more steps to reduce the chances of that happening to anyone in the onboarding funnel.