Yes, you should wait. But still then the recommendation above would be valid here: better not lock the bootloader with OEM unlock disabled.
You might. But it IMHO gives no sense. It probably won’t increase security a lot and as long as OEM unlock is disabled you won’t be able to unlock it again. It will also not make it easier to enable OEM unlock.