Just wanted to say thanks to everyone for their advice! After a stressful week (we unfortunately had planned to move all the furniture in our house the day after Charlie attacked, and that did nothing to soothe him!), Charlie seems to be back to his usually lovable self. He and the boyfriend are back to being buddies, and all is well in the world.