Wait for The Witcher Enhanced Edition indeed. It'll be awesome. IMO best RPG released in a couple of years.