Unfortunately there is no other workaround that I am aware of.
I created a ticket in Feedback Assistant 6 months ago that is still open (FB9561877). Also talked to Apple and they are aware of this issue but haven't solved it yet. Hopefully they will address this issue at some point as I want to be able to support intel machines for a long time!