I currently have two decent elemental setup due to the past 2 events - fire and water. My water comp is fairly strong, but I have almost no water weapons to work off of (mostly +hp at that), while my fire comp isn't great but I have some really strong weapons now. Which should I be focusing on leveling skills for/levels at this point? Detailed comp below

Water:
Andromeda with SSR water staff
Belphegor
Aphrodite
Nike
Ryu-oh
Weapons are 3 SSR weapons (2 +hp 1 damage) and a weak SR +atk weapon (+80hp +939 atk): Max hp++ x2, Max atk up++, Max atk up

Fire:
Andromeda with fire SSR staff (from typhon)
Motu
Brynhilde
Amon

I have 2 decently leveled fire rares (Nergal and Ignis) as well as Gaia as another random SSR that I could fill in.

Once I level all the new equipment I got, I'll have Fire atk up++ x2, fire atk up+ x6, fire hp up+ x1 (still debating buying 2 of the +hp weapon from typhon vs max break limit one of the other SR weapons)

Just kind of unsure as to where I should be investing rares for leveling skills atm - fire or water weapons. Any comments/advice appreciated or what I should be aiming for next. Thanks all!