I think in the first couple of episodes in season 2 will revolve around why exactly Rumepl needs his power, and I truly believe it has to do with this “final battle”, and that in fairy-tale world it will pick off with Snow/Charming take the kingdom, which will result in some serious consequences which will result into the “final” battle. I mean, the way Gold said “there is something that I must do” kinda gave me chills up my spine, like there is something that only he can do, and for the moment he has to sacrifice a proper reunion and save someone, or something from something horrible.
While I do believe he is addicted to power, I think based off his reaction from seeing Belle and thinking that August was Bae shows that he is truly sorry for his actions, and would be willing to give up his power to be with them.
I mean, he was in a rush, and for him to stop and completely forget about what “he must do” and tell Belle that he loves her was very touching, and I think shows how much he loves her.