I never found it to be a hassle to grab a 1/2” (13mm) wrench instead of a 12mm
My vote is replace all the 8mm rusty toyota bolts with Stainless Steel metric. Ace has them.
Youll need washers & lock washers too - which aren’t as convenient as captive bolts