ve3jlg
Funny, my workaround is quite similar.
With the difference that I always display my number under menu>settings>calling accounts>cell provider>additional settings>caller ID> Number displayed in outgoing calls (fits my threat model).
For people and companies etc. to whom I do not want to display my number, I have prefixed a #31# in the phone book - this suppresses my number for these call recipients. If I spontaneously want to suppress my number for other calls, I copy paste the number and also prefix the respective call with #31#.
If you also display caller ID for calls from that contact, you need to add another contact number for them of type "other" which has the original, plain number without the prefix.
Smart - I adopted it straight away, thanks for the hint!