Everything from 2Pac to the present are mechanically compatible, so if it fits a Compac F it should fit the 2Pac.
Unless you lucked into the batch where our main heatsink provider was out of stock and we had to use a backup with slightly different dimensions, but the vast majority are identical.
I know altair tech has snap-on fans, might check out that site.