I actually think it is likely that Regina may be trying to harm Emma with the possible poisoned food and not Henry. Henry just eats it. Or Henry goes and gets some apple to poison himself so that Emma will believe.
I agree that the kiss from the pilot at the glass coffin will either happen at the end of Ep 21 or somewhere in the middle of Ep 22.