Yes: I'm already working on this. Many things can be improved.
Thank you for you postings Elenelen. I've already ordered these because of your postings:
http://www.newark.com/aavid-thermalloy/374124b00032g/heat-sink/dp/53R2166Conveniently these come with thermal tape already applied although I think thermal glue might be the better option. They are a little large; but, that can't hurt.
It is possible that KNC has a better solution; but, obviously they are under pressure to get everything shipped right now.