Also, my original plans for this setup was to use the M21G convoy host, which would have a heatsink diameter closer to 45-48mm.
But for prototype/testing purposes, I was going to use the M21A/E heatsink size, installed into a C8 host with the battery extension tube to allow for higher power...