Looking for O2 equipment advice

I recently purchased an older Schweizer with a built in O2 system. The bottle is a Catalina and would need hydrostatic testing. The regulator is an older military type A-14 certified to 45,000 feet last overhauled in 2001. The mask is well worn and would need replacing. I would appreciate advice whether to bring the current system up to standard or chuck it and look at Mountain High equipment. I fly out of Truckee or Minden and plan to fly XC next summer and possibly wave in the fall. Is it possible to put together a Mountain High rig with bail out bottle to do all of that or would I need one system for XC and another for wave flying? Is it worth the time, effort, and money to overhaul the installed A-14 system?
Thanks