Just my opinion, but the stock bolts are excellent as the captured washer keeps them from loosening.
On alum heads I prefer studs, actually long set screws with an allan head and flanged nuts.
The twisting and pulling force on alum threads with bolts can easily ruin the threads.
you still have a set of bolts and how much thanksSet I sent to Texas recently