Improvement of a 2D Vector FEM solver for eigenvalues in helically corrugated waveguides