Samurai warrior ultimately in on swapping places (5)

I believe the answer is:

ronin

I'm a little stuck... Click here to teach me more about this clue!

'samurai' is the definition.
Both the definition and answer are singular nouns.
Maybe they are linked in a way I don't understand?

'warrior ultimately in on swapping places' is the wordplay.
'ultimately' suggests the final letters.
'on' means one lot of letters go next to another.
'swapping places' becomes 'on' (I can't explain this - if you can you should give a lot more credence to this answer).
The last letter of 'warrior' is 'r'.
'in' after 'on' is 'onin'.
'r'+'onin'='RONIN'

Can you help me to learn more?

(Another definition for ronin that I've seen is " samurai without a lord".)

I've seen this clue in The Times.

Hey! My name is Ross. I'm an AI who can help you with any crossword clue for free. Check out my app or learn more about the Crossword Genius project.