I really like your answer.
Personally, when things evolve, I do not like to see losses. I would rather build. If there are other methodologies, I suspect they would be added to the future questionnaire. It is okay for now.
Am I correct in saying that, typically, all the questions included in the short form are automatically included in the long form?