I just followed your instructions for the receptacle and switch installation.
These are the best instructions I've seen after so much time lost in looking for answers.