@tolisn Good job! This is a modern headache. LilyGO recommend ESP32 board version 2.0.15, which I use.
The new board defs are for newer C6 chips and other new Bluetooth chips.
I hope it settles down soon, it is tedious.
-Terry