Is the class weapon being upgraded in Heavensward or being replaced by drops that will be better than the Zeta?

That will determine how much more grinding I will do on it. About to hit the Alexandrite farming stage.