John,
Bottom line your Production or Reservoir Engineers need to answer this.
However as long as you have the test separator pressure and basic PVT analysis Pressure, GOR, expansion factor, Bo etc. you should be able to work everything out.
Not sure that I follow on your BSW readings. Yes they...