... Maybe. I do think he wants a happy ending although I'm not sure he believes he deserves one. I'm pretty damn sure he desperately wants/needs some kind of peace.

That would be a wait no. Unless the Queen's immortal too, or at least very long lived, because she didn't age much between casting the curse and talking to Belle. But damn, that would be an awesome theory. Up to and including the part where she yells at Gold that he better treat Ruby better than he treated her.