From the command line, I have found cvs to be limiting, but fairly straight forward to use whereas svn can be a royal pain.

Really? In what way? I found svn to work mostly the same as cvs from the command line, except that it also does renames and works with directory trees (instead of just same-name files, as cvs does). I've always prefered the command line interface for both instead of the GUIs, anyway.