Improved tensor-product expansions for the two-particle density matrix