Yeah, I felt that just raising HP would make her more dangerous - it stops her being a glass cannon, and makes her just a cannon!
As for the 4e style - I do tend a lot to Combat as Sport, if you know that term. I mean, not religiously, but in general that's how it goes. So while we can think of...