Angier,
   If it were me, I would separate them.  I do  have Waas now and am finding it's much more finicky than non-waas.  The failure mode is not lower accuracy but it simply goes off line completely.  This is most unpleasant. I think Waas is inevitable for you.    The economics of ground-based landing systems are "difficult".

Colyn