Sounds like you are handling it perfectly already. It will take time. It is perfectly normal for both to be responding the way they are. They will get used to each other and will learn to communicate and respect each others space with time. Keep encouraging and modelling what you want to see and just try to intervene if your son is pushing for hugs and she is looking like she doesn't want it.