SM 2H Gear Questions

[Kyraith]

Hello! I am looking for advice on what gear to get next. I am currently wearing 4 Invader, 5 Beastlord, and 3 Genesis w/ smuggler weapon. I spec ED most of the time and WW in city.

I imagine my next steps are to look for gear in PvE, but not sure what to go for in particular. I don't need any more Invader as the bonuses are defensive from here out. I am also looking to replace one of the Beastlord as I don't really need the 5% Disrupt, but not sure with what. Maybe a 1 off jewel?

Also curious what weapon should I be going after until Fort, and is there anything I should go after thats better than fort?

Thank you!