I think they will spend a portion of the entire season doing the awkwardness between Emma and Snow and Charming.
About Jefferson and Grace. I really think that Jefferson will just get her back and that will be the end of it if that is what he wants. I don’t think he is going to be sharing custody with the neighbor family.