I am beyond confused right now. Tara, I just went back into the media settings page and those two options were available, and indeed pointing to the wrong directory. That said, I also found the culprit in the PHP database as 'upload_path'.
I do believe it will now be fixed.........