There is definitely angsty stuff ahead for the Bae/Rumple reunion. And I slightly doubt that it’ll take the same turn as the Regina/Henry relationship immediately after what Bobby said in his last interview. Rumple is still a weak man, who is not willing to give away the only strength he has – magic. Even when he finds Bae and tries to reunite with him, tries to show him that he is intending to redeem for him, that he risked so much for him, Rumple will search for a way to somehow wind around the lost of his powers. The pre-DO Rumple had a slightly different personality structure than pre-evil Regina.
ETA, Exactly because he already opened himself to wrong-Bae (August) and got fooled in “The Return” I seriously doubt that he’ll let himself get near towards any emotional point with another “claimed Bae” that easily.