It sounds like you have a pretty good handle on things, though if you're going to set up your laptop as wireless, at least externally, then one piece of advice I'll give you is to buy the same brand as your router. it does make a bit of difference in the radio signal quality in my experience.
Wisdom is knowing what to do. Skill is how to do it. Virtue is getting it done.
That which does not kill you, isn't trying hard enough.