Don't forget that Gyuchan is 11 month. Added Gyuchan's age and the pregnancy (± 8 months) and added Gyuyoung age (± 5 - 6 y.o), so Chayoung probabbly lost about 6 - 7 years + 7 months of his memories. But if we added Gyuha's preganancy (8 months) then peobabbly around 7 - 8 years + 3 months of his memories. Just my speculation.
And yes! I do hope the same as you. I think this arcs is more about how Gyuha will handle the situation and learn to be more affectionate towards Chayoung.

I think they were about 28 in s1 based on Chayoung's dad saying that Chayoung's almost 30 and should get married. Chayoung's memory probably regressed to right before he and Gyuha slept together for the first time, so he's lost about 5-6 years of memories if Gyuyoung is about 5 years old.
Gyuchan is proof that Gyuha's crankiness is natural, so I think Gyuha will end up being more outwardly affectionate towards Chayoung. Hopefully Chayoung is happy to learn about his current life and new family