Help with IJN Submarine

Hi All,

I want to make a diorama with Tamiya's 1/700 I16 and I-58 model subs. Although the two subs I want to depict did carry a mini-sub and a Glen floatplane like the I-16 and I-58 included, the numbers are different and I want to know if these two are close enough to what I want. Though I am sure there would be differences. If the differences are not that big then I am happy.
The subs in questions are the ones that attacked Sydney, Australia in May 1942. The subs carrying the mini 2 man subs were:
I-22, I-24 and I-27.
There were two other subs carrying Glen float planes but I want to do the I-21 that had Ito flying the Glen before the attack.
Out of the 3 above, are they close to the I-16 or I-58? For the I-21 which one out of the I-16 and I-58 is closer?
I've tried to search on the web but as Japanese submarines are not my speciality I found the whole thing confusing.
Any help would be appreciated or direction to follow.
Thanks in advance.