[cmccabe]

This is way too complex. Just put everything in .bashrc and symlink .profile to .bashrc. Then if there's something you don't want executed in non-interactive mode in .bashrc, put it in an if statement.

Simple.