After writing the previous post, I couldn't quite live with myself. The idea that Drayton needed to work out of his apartment and not have a separate office just gnawed at me like a child on a jawbeaker. So I went and did it. I revised chapter one so that it took place in his home office and rewrote a small bit of dialogue in Chapter Six to reflect the change.
At least now I'll be able to sleep and look myself in the mirror.