I decided to add another heatsink to my motor. I was unable to find any clip on ones that would fit in my confined space, so I made my own from cheap cpu heatsinks.
Here is one I've had installed, and a new one:
I cut grooves in the new one with a hacksaw through (almost) to the thermal tape:
next I bent it around the motor:
and then installed it:
