Tracy's motto has always been, "Start as you mean to go on." So if you do not want your LO in your bed long term, you can break this habit fairly easily at this young age by simply choosing not to do it any longer. Have you tried Shh-Pat yet? Most LO's are ready for PU/PD at this age but give how unsettled your LO is after that second WU, Shh-Pat might be more appropriate. Keep in mind also that your LO is still learning how to self-sooth so he is depending on you to show him the way. Two NW is pretty typical for this age.
If your LO is taking the pacifier out, or doesn't seem to need it, this is a great time to get rid of it cold turkey. He may not even notice/care.