X2 for the AC disk brake kit. And pads are 1990s VW rabbit, so easy future maintenance. Call SoCal auto parts... they know our cars, work w/ all builders, can tell you what you need.
a few more $$$, but not much more than the bolts you found.
i debated the 4 to 5 stuff conversion for a while... grad I did! Lots posted on “how to” and “lessons learned”. I can look for my old cheat sheets/ what I posted if you are interested.