It's probably not a good idea to deal with it whilst he's teething hun, we can always tackle that later. I'd concentrate on getting him to sleep independently for naps and BT, NW's are a whole other ball game and IMO we do anything to get us through.
Try medicating with ibuprofen for teeth, it works wonders. And elevating the mattress slightly if you can. A couple of towels under one end of the mattress. The NW's should settle down after this teething episode stops. Then we can look at tweaking,your routine if needs be if it continues xx