Spent the better part of yesterday rebuilding my computer and reinstalling software, the whole process went much smoother than I expected and everything is now back to normal, no longer does it sound like someone is torturing the neighbors cat, in fact it's so quiet that it's hard to tell it's on unless you see the case lights ( or I've left the monitor on ).
Now it's business as usual, hopefully my computer will be trouble free for a while.