Imo keep it at the centreline. OSM's ways are an abstraction anyway. For the single carriageway section, I would put the boundary very close to but not attached to the highway. (If I am wrong @Kovoschiz can correct me)