Sounds like you have it under control.

The roof thickness will matter more than the walls, and the shelf area really only needs the same thickness as the 2x4 wall section.
Make sure you seal your bottom plate area while you have access to the sill, this is an area mostly forgotten and sends cold air into the room.
Good luck on your project.