It turns out that placing similar config files (i.e. bspwm-related) in
the same directory is not the way to go about handling dotfiles since
each config file (or dotfile) *should* manipulate only a single program.
This was not the case back when I used urxvt (which would require the
old method of .Xresources), but now that I understand more about how
*modern* dotfiles work (with $XDG_CONFIG_HOME), separating dotfiles by
program became the obvious choice.
As much as I enjoyed using Waterfox, the update to Firefox (and its
developer tools) is pretty nice. Since many add-ons now support this
new version of Firefox, I think it's now time to make the switch.