Hi Zakaria,
Thank you for posting.
We have an easy path forward for you. We built an app called FormsViewer that understands InfoPath XSN format. No change to your forms needed. Just install the app and configure your lists and libraries to open using the app and you can remove your InfoPath dependency.
In addition to being minimal effort, our FormsViewer app enables new features via rules in your forms. You can add a CSS resource to give your forms a responsive mobile friendly UI. You can add SMS authentication via phone to support external access without a SharePoint login (which also reduces SharePoint licensing). FormsViewer even works without SharePoint now. And, you can use it with SharePoint online (O365) or SharePoint On Prem (2013 or 2016).
It's easy to install and licensing is free or very inexpensive based on usage.
FormsViewer also provides some Designer features via the browser. We are still working on finishing feature parity with the InfoPath Designer and hope to have it done this year.
Because the XSN and XML format doesn't change, all of your templates and data continue to work "as is". Plus we can upgrade them quickly to look better.
You can find out more by going to Downloads -> FormsViewer. Most of our https://www.youtube.com/Qdabra webinars also feature FormsViewer now. And, here's a link to a short step-by-step explanation of the process: https://www.qdabra.com/en/products/FormsViewer.aspx
Please contact me at Patrick.Halstead@Qdabra.com if you are interested in a short call or demo.
Kind regards,