Thanks all. It seems the thick (Mavic) spacer is correct, which is obvious to me in hindsight. I tried just that one and just the thin one. The Mavic one makes everything line up correctly with no adjustments needed.