Sounds good
Having a drink and / or small snack to offer mine when I wake them from naps, that they can have sitting on my lap, helps to ease the transition for them.
Maybe if he gets used to being woken (and associates it with something pleasant happening?) it won't be so upsetting for him?