Better front flat mount adaptors for SRAM calipers?

Unsure if this is just a SRAM thing or across all brakes of this type. The 160 mount on my CX bike lines up the bolt so it fouls the caliper on the way out as does torx key a little when undoing. Inevitably it's eventually rounded off. PITA and seems really poor design?

Anyone found a better set up that improves things? Maybe a different adapter or spec of bolt to that won't round so easily. Or just give up and go 140?

My 2p - it Looks like flatmount was designed for 140 and then 160 an afterthought that would have been better left as postmount

Just looking for a way to be able to regularly swap wheels basically! But centerlock shims haven't worked well for me. Still get rubbing on the disc