Cannot help with your shim question, but
25mm bar risers fixed my issues, this bought them up and towards me making things far more comfortable. More would be better but no more slack in cables/hyd lines.
Hope this sorts out for you, disappointed the initial design of the bike did not give more adjustment ability.
We need to be comfortable !!!