Amos comes off far too gruff and angry to me in the show. I always read him as pretty reserved with usually a sly smile in most confrontational situations or otherwise just passive expression.
I also thought Naomi was just Asian in the book, so clearly I just skipped right past her character...