You wanted a carrier and I think you should stick with it to avoid confusion. Retconning will be an issue for the others possibly. Also, I personally am against the idea of a guided missile destroyer/frigate/cruiser since TBP is supposed to be a developed nation of its own. With their allies, you couldn't actually realistically get 4-5 missile cruisers in there.