If you are going for a NOS looking 1016, go for the JMB case. I prefer the worn looks so I don't really mind the naturally aged gen case. I built a couple of these a while back using a gen 1601 case and a JMB v1 case. I really liked the 1601 case even without enlarging the lug holes (but using shoulderless springbars).
The yuki 7206 may fit better on the jmb case as well but looking at pics of the gen 7206 they do not fit well like modern oysters do today.
If it was in my budget, I'd send it to Rolojack for case reshaping and refinishing.
Here is a JMB v2 case with a yuki ETA dial. All rep except for the gen folded oyster and clasp.