It is currently not confirmed whether electrons and quarks are actually made up of anything smaller - rishon or otherwise, so this is all quite hypothetical.
The smallest particles that have been discovered and that don't only exist in theory are the quarks. They are what make up protons, neutrons, all kinds of baryons, and a few other categories of...