Shop would know what the OEM parts pick was in the 1st place , since they can look it up .. call the factory, etc.

I just have 1 Integrated headset Bike ..it falls out when I loosen the stem, w/o top Cap on, if Wheel is not on the ground..

so I got a Problem Solvers Pinch bolt spacer, It goes on top right above the upper headset race cover.

to adjust the bearing it is another bolt to back off , but it did let me stop dropping the fork in other situations.