SOLUTION SPOILERS BELOW
After some trial and error, I managed to make this one almost 100% logical. The only hints you'll need, that I can tell, are that C-8 R-8 and C-10 R-11 are filled in. Otherwise, it's been tested and tested again, and should be logical :-)
Great Job.