Syria, UN in Homs aid deal as Aleppo fighting hots up