I also have exactly the same requirement. Just a few enhancements to the survey model would have made a huge difference. The OCA Survey module roadmap lists some valuable enhancements. Perhaps we can request for this to be added as well.