I was in exactly the same situation where I was going for the TomahawkI was originally going to go for the MSI tomahawk at the time of launch of the Z690 but it was out of stock everywhere so went for the EDGE for an extra £30.
I came from an AOURUS Z390 and the MSI bios are far better than the gigabyte boards and just work.