Yeah. For the 1st Aquaman movie, it should definitely be between him and Ocean Master.....And in the 2nd movie, it will not only against Black Manta, but also the struggle within himself because he's half-human and half-Atlantean. As he rules Atlantis with love and care, he also questions himself about the land he was raised, like should he be defending the surface world after seeing and failing to protect some rare sea creatures from poachers or ignore their plea and rule the kingdom with just and care for his Atlantean people.
Also can't wait to watch the 2nd season of Arrow. It's gonna get interesting. Hopefully we see more of Deathstroke, Deadshot, China White. And also the debut appearance of Brick, and hopefully see The Count recover from his catatonic state.