Should the claims that were found patentable/allowable by the OEE be redrafted, if their current form does not comply with the established requirements of the European Patent Convention (EPC)?

Yes, the claims shall be drafted in a manner which is compliant with the requirements of the European Patent Convention (EPC) and relevant case law.