Hi @MegH
Yes, the best practice would be to migrate from JSP based static templates to editable templates based on HTL.
The WCM Core Page component (latest version) should be your new base component.
You can refer the aem-guides-wknd project for more details and structure - https://github.com/...