Image path confusion

I have my main site and one add-on site up and running on multisite. Today I had a major issue come up with a third site and the host admin ended up pretty much wiping the install directory, so I decided it would be a great time to go ahead and migrate this third site into my multisite install.

So far, after lots of SQL insanity, I seem to have managed to get the main content back up and running. But when I went to put my old original header image back up, I just hit a brick wall. Here are what I believe are the relevant image path settings as they stand right now:

Uploads Use Yearmonth Folders = 0
Upload Path = wp-content/blogs.dir/3/files
Upload Url Path = https://thedixons.net/wp-content/blogs.dir/3/files
Fileupload Url = https://thedixons.net/wp-content/blogs.dir/3/files

TheDixons.net is site 3 in my multisite network

When I attempt to upload a new header image, it is broken. WordPress is trying to assign it this URL: https://thedixons.net/files/cropped-Server+Room2.jpg

htaccess contains the following:

RewriteEngine On
RewriteBase /
RewriteRule ^index\.php$ - [L]

# uploaded files
RewriteRule ^([_0-9a-zA-Z-]+/)?files/(.+) wp-includes/ms-files.php?file=$2 [L]

# add a trailing slash to /wp-admin
RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]

RewriteCond %{REQUEST_FILENAME} -f [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^ - [L]
RewriteRule  ^[_0-9a-zA-Z-]+/(wp-(content|admin|includes).*) $1 [L]
RewriteRule  ^[_0-9a-zA-Z-]+/(.*\.php)$ $1 [L]
RewriteRule . index.php [L]