Yeah, with Margaery they might be taking a few liberties; but I think it's implied enough in the books that she's clever and charismatic that her portrayal on the show isn't a big stretch.

I agree that TV!Cersei seems more clever. Frankly I like her TV persona quite a bit better!