1. Can't remember the exact requirements - isn't there some requirement for some cross-country time too? But yes, I think you will just need to complete the course without duplicating the stuff you've done already - as long as your instructor is happy with your flying in this short period, of course. Not 100% sure on this, though.
2. Yes, that's right, as long as you get the updated page of your license back from the CAA before you go to the States. Your FAA license will allow you to fly within whatever rules are the most restrictive of the FARs and your own license. The FARs allow private pilost to fly at night, so if your license allows you to fly at night, then you will have that privilege on your foreign-based license.
FFF
---------------