bharat singh
From your post it looks that you believe that four varna always existed and rajput you feel belong to a cast or khastriya varna.
Though it is common knowledge but I would quote Ibbetson as that may look more accurate version to you.
out of these so called four groups
Khastriya and vaishya never existed.
Sudra is just a derogatory term
only brahman group existed.
Than why this confusion because the khastriya was used in India in literary term originally used for khastriyas of eastern europe which were living along with brahmans priests when they entered India the term of their literature was used more in literary sence.
Now according to this varna definition the agricultrists are termed as vaishya.Have you ever seen vaishya used with or for any jat farmer.
This should open your concept of varna.
Again it seems that you find gujjar and rajput some different stock.
For that I will like you read any Indian history book on rajputs.