I heard that... But every time I talk it just comes out "Edo" unless I'm thinking really hard...

Sure there are! I mean... I guess they didn't get to be the ranks you might be thinking about, but... there were lots of jinba fighting in the wars... and some serve lords still.