Did you by chance check to see if there was a bios/firmware update you could apply?
Also, if you really want to take it to the “predictable extreme” you could have your NICs named based on the mac address with something like:
storage:
files:
- path: /etc/systemd/network/99-default.link
mode: 0644
contents:
inline: |
[Link]
NamePolicy=mac
MACAddressPolicy=persistent
Gives you a NIC names based on the mac address like enx5254009110fa
.