Herewith, we propose two new exponents for the recently introduced XDW-CASPT2 method [S. Battaglia and R. Lindh, J. Chem. Theory Comput. 16, 1555-1567 (2020)], which fix one of the largest issues hindering this approach. By using the first-order effective Hamiltonian coupling elements, the weighting scheme implicitly takes into account the symmetry of the states, thereby averaging Fock operators only if the zeroth-order wave functions interact with each other. The use of Hamiltonian couplings also provides a physically sounder approach to quantitate the relative weights; however, it introduces new difficulties when these rapidly die off to zero. The improved XDW-CASPT2 method is critically tested on several systems of photochemical relevance, and it is shown that it succeeds in its original intent of maintaining MS-CASPT2 accuracy for the evaluation of transition energies and at the same time providing smooth potential energy surfaces around near-degenerate points akin to XMS-CASPT2.