Note that Akitsu Maru doubled as a merchant cruiser and sub tender at the same time. It wasn't an "either/or" although it started out more as a raider and ended up more as a sub tender as the war went on.
The IJN Carrier Liberation Force - "Because We Care" Join the IJNCVLF. Service Guarantees Citizenship!