Quick further update:
Decided that current working setup had loads of old PC based drivers - so decided to do a clean instal. So once Win 7 was installed, I ran updates and again, only loaded Gigabyte drivers except Audio.
Have a clean machine which is really quick but a pain to reinstal all my software! Well, night is young!