District Energy System with Thermal Energy Storage

I have a few questions regarding modeling of a LEED CS building using option #2 from the Treatment of District or Campus Thermal Energy in LEED guide. This is in regard to a DES that provides chilled water only. We have monitored the DES cooling plant for a complete year and have determined the average efficiency of the plant. A thermal energy storage tank is to be added to the cooling plant to shift the energy use to the off peak time period of the energy tariff. Under Option#2 of the LEED guide in section 2.4.2.2-4 would it be allowed to do the following: 1. Use the monitored averaged efficiency from the DES equipment in the proposed case energy model and 2. Model a thermal energy storage tank in the proposed case energy model sized to shift the cooling to the off peak time period and 3. Model the proposed case cooling equipment (chiller, pumps, cooling tower) as the same type as those in the DES with the chiller sized at 1.15 times the peak building load and 4. Separately meter the building and plant (in both proposed and baseline) with the associated building and DES energy tariffs (time of use based) tied to those meters?