(Another) English requirement questions

Hi,

I am currently finalising my PhD in the UK, and I have been offered a Postdoctoral position elsewhere in the UK. As such, I am looking to switch from my tier 4 visa to a tier 2 visa. However, I am running into a potential issue with the English language requirement (other requirements are not a problem).

The two options for me to demonstrate knowledge of English are 1) holding a degree taught in English or 2) having met the requirement at a previous grant of leave.

Regarding option 1, I do not hold a bachelor's or master's degree taught in English. However, I am currently finalising my PhD, would that be sufficient (for example, if I have an official docuemnt that I have submitted my thesis, even if it is before my viva)?

Regarding option 2, for my current tier 4 visa I was considered as a 'gifted student', and the english requirement was waived (my english scores back then was B1, which is below level B2 required for a tier 4 visa, but in principle sufficient for a tier 2 application).

Finally, I also have a certificate for an IELTS test certifying that I satisfy level B2 which was not used for my tier 4 visa, but that certificate is past the validity date now.

So, the question is, would either of these (or a combination of these) be sufficient to satisfy the English language requirement for a tier 2 application?

Many thanks!