At this point I think I'm comfortable putting the heatsink on the FPGA. I don't foresee needing any rework in that part of the board, the 3V0_N supply still isn't working right but that's way off in a corner and easy to rework without the FPGA heatsink getting in the way.