Link here.
I wouldn’t mind getting the 3700X either, but it might be overkill for me. I think the 3600 should be just fine.
Here is some info on the incoming BIOS fix. It’s already available for my Asus board, so maybe check your mobo maker’s website to see if they’ve added the new version yet.