A Commodore being something of a senior Captain could work assuming things were done differently in the future. Things do evolve including rank systems. Consider that both Wesley and Decker were older than Kirk and sufficient years of distinguished service got them the rank of Commodore while allowing them to retain a single vessel command if they so chose.
If so that now raises the question as to what is a Fleet Captain? Is it an actual rank or a position?