I guess this will just turn into the 3D printed fan shroud thread! Here is a 40mm x 10mm fan shroud for a Heatsinkusa heatsink with the smaller profile pins. as soon as I get my hands on the meatier heatsink, I'll design one for that too! Link to file: https://www.thingiverse.com/thing:4077734