Most bubs tend to work it out for themselves...they're not really used to the whole day/night thing when they're born, obviously. But if you persist with an age-appropriate bed-time routine I think he'll soon start to associate the dark and quiet with sleep.
With my two, if they started to get upset and cry they'd find it far more difficult to get to sleep. I'd always try to comfort them and soothe them before they became worked up.
I can sympathise with you about the night/day confusion. My son spent 3 months in NICU/SCN and came home with a two hours awake/two hours asleep routine that lasted well into his first year. NOICE
Bookmarks