I agree that it would have been better if the kiss between Henry and Lucy actually worked, though their reasoning is consistent.
I still don’t think Anastasia is the guardian. I think that Gothel just wants to use her, so she said that so that Rumpel would wake her. Gothel has some sort of plan that we know nothing about.