MUCH mo' better . . . . . . but don't the main filter capacitor foils need to be extended out a bit more, in order to make physical clearance from the heatsink fins on the component side ?
By all means, leave the companion HF bypassing ceramic cap up nearby the chip, as you have it , just...