Sinky,
As far as your realism question, I don't think it was all that uncommon to refit during patrol, at least towards the end of the war when there were bases closer to the action than Pearl and Midway etc... They called them "Double Barrel" patrols. Hope this helps.
Howler