Have you considered adding “opportunity” stage/s at the beginning of your sales pipeline?
If the first stage is “opportunity” you can add properties to track whether they had a demo or requested info and then move them to the deal stages if there is a deal, or a qualified out stage if there isn’t.
This would allow you to do everythin g you suggest and give accurate conversion percentages