Abolition of section 21 - impact on break clauses

Possession - Section 8 and Section 21

 I am about to enter a two year tenancy agreement with a break clause after one year (one off). I am wondering whether I should add another break clause to take affect on 30 September 2025 . I understand the abolition of section 21 will only apply to existing tenancies from 1 October 2025 (assuming the bill remains as at present). But will a section 21 notice remain valid after 1 October 2025 if the tenants haven't vacated by then and if a periodic tenancy ensues?

Also should one ensure that after service fo a section 21 notice (even after a year) the agreements provides for a contractual tenancy rather than a statutory one so its not a new tenancy. What are other Landlords doing who are entering into new tenancies now