Hunter58,
you might be right.
However since freighter version usually has different floor structure plus a completely different loading it is possible they will certify it later as a derivative.
One way would be to follow what you have said (for stretch it is the same thing).
They do talk a lot about that which is unusual. Again, they do not share what the real reasons are so at the end, I believe, they will certify the aircraft without problems.