I have this in my ~/bin, but I like your version even better!:

    grep --color "$1"'\|$'