I do has ideas for Jinni with Angel for the time skippage!  I'm picturing food... dinner.. more dancing...a stolen kiss.. guilt.. admissions.. and then a hopeful sign of a wandering Halliwell to suddenly invite over for a quick change to fend off the inevitable embarrassment...Oh the little scene playing in my head... its going to be entertaining to say the least!