Today's progress:  I brought Church to my office and closed the doors.  Saffy tried to gently paw at the door a couple of times and there was one hiss, but it went reasonably well.

This has also been a great start of telling kittie "no" with regard to getting up on my desks.  I know I won't be able to keep him off of everything, but I will be working to keep some things out of bounds, especially my kitchen counters.  It does of course mean I need to provide some high things for him in lieu of the no no areas.