I'd be cautious of changing root's shell or messing with its config. I once changed a root shell and then found I couldn't get in to fix a problem when my /usr or /var partition broke. I needed a statically linked shell binary in /sbin which is how it was initially set up, for good reason.
After that, I never messed with root's shell again.
Furthermore I actually like it to be uncomfortable at the # prompt. Having all of $'s creature comforts strikes me as a little dangerous.
I suggest you leave good enough alone.