Facilitating the Social Welfare Convergence of Strategic Energy Storage in Electricity Markets