Another way to say 睡个好觉: 好好休息hǎohao xiūxi,rest well.休息 means to rest.
There is a sweet way for your son to remember 晚安wǎn'ān better since you son has already learned "我爱你".The Pinyin without the tone marks for 晚安 is w a n a n. If you make every individual alphabet a component of another word's Pinyin , it could be wo ai ni ai ni. Let's add the tone marks and make a small change, you will see it as wǒ ài nǐ, ài nǐ我爱你,爱你 meaning "I love you, love you." Doesn't it make 晚安 a very sweet word to say to your beloved ones? You can tell your son about this that whenever he hears 晚安 from you, he can relate it to "我爱你爱你" which shows your love for him. Don't get me wrong though, 晚安 doesn't mean 我爱你爱你 culturally.
Hope you like my answer.