Yes, your YF was almost certainly installed as a service replacement. But if you look at the list I sent from Jon (Carbking’s) site….there are only about 2-3 possibilities for a 216 YF with a manual choke. Perhaps the kits cross over and it doesn’t matter.
I’d call Jon during the hours listed on his site. He’s the guy when it comes to Carter stuff.
The YF is excellent when properly rebuilt. Unless you really desire complete originality, I’d stick with it.