Just wanted to update...
Getting a bigger casing was in my list, but I went with the C7 in the end.. At least I don't hear the fan 3m away from the case.. U do hear the fan noise next to the PC though.. So, was just changing the fan instead of more stuffs...
Was itchy to get a newer CPU but the 7700 is already providing great performance.