An improved neoclassical drift-magnetohydrodynamical fluid model of helical magnetic island equilibria in tokamak plasmas