You asked
Should I upgrade from the fujifilm x100s?
Here is what the site says about that.
From Fujifilm X100S: Fujifilm X100S: A fixed-lens compact by Fujifilm with a 16.3-megapixel APS-C sensor, announced in 2013. Specs - Maker: Fujifilm - Lens: built in, 23mm f/2 - Sensor: APS-C, 23.5 x 15.6mm, crop factor 1.5 - Resolution: 16.3 megapixels - Stabilisation: none - Announced: 2013 - Type: fixed-lens compact Focal lengths on it Its 23mm lens frames like 34mm on full frame, and f/2 gives about the depth of field of f/3 there.
From Fujifilm X100: Fujifilm X100: A fixed-lens compact by Fujifilm with a 12.3-megapixel APS-C sensor, announced in 2010. The original hybrid-viewfinder compact that started the X series.
Quoted from this site's pages.