I know the OP has gone the more expensive "full replacement" route, which is fine.
Just a data point and alternate route for others also contemplating changing to Shimano cranks on a BB30 or BB30A bike.
I have used the inexpensive and really easy and quick Wheels Mfg Acetal plastic adapters with good results. Just pop them in by hand or a light tap w plastic mallet and bada bing you are good to go. Over a year now and still quiet.
Steve