Need some input from Witcher1/2 fans

I played the Witcher 1 Enhanced Edition bought outright on steam.

I am not here to trash this game...but I must point a few pros and cons.

I sense a game that a lot of good dedicated people put a lot of time into, and it is worth my time in playing.

The combat system requires pinpoint timing way more than I'd like to accomplish several combos to efficiently kill enemies...I am hoping this improves as the game goes on in the skill tree system, as I've barely gotten through Geralt's first major battle so far.

The switching of modes is frustrating and annoying...I hope in time I can advance one mode to just keep consistent throughout the game. I don't mind games that require you do more than click a lot, but they need to be set up well much like some of my favorites like assassin's creed or even games that are much simpler like mass effect {cover, shoot, biotics, etc.} Or even as simple as the Diablo games. There was still more to them than just simply clicking.

Does Witcher 2 improve on any of these? I am ready to pay full price for it because witcher 1 from scenes I've watched on youtube is amazing {for more reasons than just BEWBS!}. The character models are stuff, but impressive looking, and I look at when this game came out and can understand things weren't nearly as detailed back then as they are now...still though, the original mass effect had decent looking character models that had really good lip syncing {debatably better than 3 but that's a different story all together}.

So my question to all witcher fans is, did they improve the combat system and engine much? I think beyond those 2 stipulations it could be a great game that suits my tastes...I just don't want to dish out 50 bucks and be disappointed.

I acknowledge these are my personal preferences and tastes, and have stated above that I do not believe the game is terrible...but that it is almost impossible to play for long periods of time due to how tedious switching weapons modes is, etc.

"Good...Bad...I'm the guy with the Gun" - Army of Darkness - Ash (Bruce Campbell)