Well, today after a lock i decided i had had enough and decided to reinstall windows, once it was all done, i did what would normally cause a lock up or a bsod, which was leave the computer alone for 20/30 mins, but nothing happened this time, then left it for about 3 hours and still no locks, so luckily it looks like its all sorted :)