Mike,

Your insight into the conditions surrounding the rehabilitation take it from
the theoretical to real life.  Unfortunately, few of us ever have the luxury
of applying pure theory to a real life situation.  Your assessment clearly
details the necessity of cleaning and material replacement.  Personally, I
probably would lean toward matching new materials to the condition of the
existing, but each project has its unique considerations.

Tom