I added an option in TFTPD32/64 to replace the variable $ARCH$ from the boot filename with "x32" or "x64" after detecting if the pxe booting machine is using BIOS/CSM or UEFI
I would love to explain further, or to do a git push, etc... but I'm not sure how to do it, so here's a DIFF file