I am with you MajorJuggler in that FFG's terms are unacceptable and would have done the same if I were in your shoes.
I also fully support your decision of not making your 2.0 work public. If you do, there is nothing stopping FFG from using your work. If they are indeed interested in your work, they should pay for it, not just "borrow" it later.
Having said, and as an engineer myself who has developed very complex models in my field-of-work, developing the model is the easy part. Validating/testing such model, to ensure it is accurate, is where it becomes expensive and complicated. Perhaps it is here where FFG thinks getting your data ahead of time (pre-release) is unattractive, since without validation it has diminished value. From the earlier discussion we had on these forums, I don't think you can develop a model that is purely mathematical and make it really useful, there are just too many variables, you inevitably will depend and will have to pair it with test data (validation part).