Need help upgrading PC

Currently using a ryzen 5 5700x, Aorus b450m elite and 16gb of 3200mhz ram.

I was looking to upgrade to either of the below:

14600KF + Z690-A ROG + 32gb 6000mhz cl30 ~ 760 AUD

7900X3D + X670E + 32gb 6000mhz cl30 ~ 1100-1200

9800X3D + X670E + 32gb 6000mh cl30 ~ 1300-1400

I am looking to upgrade as I think the motherboard is showing signs of failure. I am heavily considering the intel option as seems really good value and I don't plan on upgrading for at least 5 years.

My main needs are at least 3-4 M.2 slots and preferably PCIE 5.0 for both GPU and m.2 (just for future proofing). I also game at 1440p if that helps.

Any help would be appreciated, if anyone has any better solutions please feel free to respond (would like the best price to performance).