If you end up pulling the heat sink replace it with a water cooler.
I know we all like air cooled
but liquid cooling is the way to go with desktop pcs.
Quieter than whisper quiet and keeps temps well under control.
I use NZXT Kraken coolers in my builds but the Corsair coolers are just fine as well and a bit more budget friendly.
They really are worth the expense.