RogerB

I love these questions as the variety of replies always gives me something to think about. I'm pretty much in the camp of stay with what you have - there's a lot of good use cases in these comments to evaluate for one thing.
 
I can only comment on my experience and what's good for me and why, so here goes.
 
X-Pro2, 14mm f/2.8, 23mm f/1.4, 23mm f/2 35mm f/2, 18-55mm f/2.8 and X100 - that's my kit for family, friends, events, street, travel
 
I work in urban, rural, dusty and dark environments along with all the others.
 
I bought my Fuji as a light weight alternative to a DSLR which I still have.
 
I find the 14mm f/2.8 and 23mm f/1.4 to be extremely useful lenses especially in the way they interface with or promote manual focus. I bought the 23mm f/1.4 as a result of having the 14 and discovering the MF clutch.
 
The Fuji is my go to camera. The 23mm f/1.4 is my indoor family/event lens, the 14mm f/2.8 is my urban travel, landscape and travel interior lens, the 35mm f/2 is my family head-shoulder, small group, candid  and street lens. The 23mm f/2 is my walk-about-in-the-desert lens, the 23mm f/1.4 is my critical stitched panorama lens, the x100 will do all of the above and did until I got my XPro2.
 
Whenever I have an equipment crisis, especially lenses, I search LR for all the times I used the lenses involved, or those close to those focal lengths. I see what worked and try to think of what I missed in those situations and if a new focal length/aperture would help. Then I take the lenses in question and use it only for a week/month as an evaluation of what does/doesn't work. When I concentrate on just one focal length I often find that it boosts my creativity and vision with that focal length. If I'm thinking about a prime and I have a zoom that covers that focal length, I do the same for a week/month with the zoom taped to the focal length in question. I can't think of when I've really lost ground with those efforts - I almost alway come out a more creative and skilled photographer. 
 
Another thing that helps me is that I try to think about my equipment usage as "roles" rather than features. That often mitigates the questions about focal length overlap or too much/little of something. As you can see, I have three active 23mm lenses. They have different roles. There's hardly a time when I've spent/wasted time deciding on which one to use - they have their jobs. 
 
One thing that does help my decision process is that I have an XPro2 and the 23mm f/2 lens sometimes begs for usage because it is more VF friendly on that camera. What also fits into the roles on my equipment is weight. The travel weight, carrying a camera for 24/7, does have a role in deciding on personal comfort and ease of travel, especially if I'm on a concentrated public transportation tour.
 
Just some things to think about as you sort this out.
 
The advice of never sell a lens that you like is IMO good advice. If you look at my lens closet, you might extend that to "never sell a lens". That's because in my experience, life changes and sometimes you meet your going requirements, coming. I've been photographing for several decades and my prime lens has been the 35/23/35/23 lens, several times for different, non-contiguous decades. That's because my life and family have been through different stages where there are naturally different emphasis on life and recreation. There is also the personal growth as a photographer to consider. Years ago I would never be comfortable photographing a person with a 17mm lens, now I routinely do that with a 14mm lens.
 
Good luck and 
Best Regards,
Roger

I love these questions as the variety of replies always gives me something to think about. I'm pretty much in the camp of stay with what you have - there's a lot of good use cases in these comments to evaluate for one thing.
 
I can only comment on my experience and what's good for me and why, so here goes.
 
X-Pro2, 14mm f/2.8, 23mm f/1.4, 23mm f/2 35mm f/2, 18-55mm f/2.8 and X100 - that's my kit for family, friends, events, street, travel
 
I work in urban, rural, dusty and dark environments along with all the others.
 
I bought my Fuji as a light weight alternative to a DSLR which I still have.
 
I find the 14mm f/2.8 and 23mm f/1.4 to be extremely useful lenses especially in the way they interface with or promote manual focus. I bought the 23mm f/1.4 as a result of having the 14 and discovering the MF clutch.
 
The Fuji is my go to camera. The 23mm f/1.4 is my indoor family/event lens, the 14mm f/2.8 is my urban travel, landscape and travel interior lens, the 35mm f/2 is my family head-shoulder, small group, candid  and street lens. The 23mm f/2 is my walk-about-in-the-desert lens, the 23mm f/1.4 is my critical stitched panorama lens, the x100 will do all of the above and did until I got my XPro2.
 
Whenever I have an equipment crisis, especially lenses, I search LR for all the times I used the lenses involved, or those close to those focal lengths. I see what worked and try to think of what I missed in those situations and if a new focal length/aperture would help. Then I take the lenses in question and use it only for a week/month as an evaluation of what does/doesn't work. When I concentrate on just one focal length I often find that it boosts my creativity and vision with that focal length. If I'm thinking about a prime and I have a zoom that covers that focal length, I do the same for a week/month with the zoom taped to the focal length in question. I can't think of when I've really lost ground with those efforts - I almost alway come out a more creative and skilled photographer. 
 
Another thing that helps me is that I try to think about my equipment usage as "roles" rather than features. That often mitigates the questions about focal length overlap or too much/little of something. As you can see, I have three active 23mm lenses. They have different roles. There's hardly a time when I've spent/wasted time deciding on which one to use - they have their jobs. 
 
One thing that does help my decision process is that I have an XPro2 and the 23mm f/2 lens sometimes begs for usage because it is more VF friendly on that camera. What also fits into the roles on my equipment is weight. The travel weight, carrying a camera for 24/7, does have a role in deciding on personal comfort and ease of travel, especially if I'm on a concentrated public transportation tour.
 
Just some things to think about as you sort this out.
 
The advice of never sell a lens that you like is IMO good advice. If you look at my lens closet, you might extend that to "never sell a lens". That's because in my experience, life changes and sometimes you meet your going requirements, coming. I've been photographing for several decades and my prime lens has been the 35/23/35/23 lens, several times for different, non-contiguous decades. That's because my life and family have been through different stages where there are naturally different emphasis on life and recreation. There is also the personal growth as a photographer to consider. Years ago I would never be comfortable photographing a person with a 17mm lens, now I routinely do that with a 14mm lens.
 
Good luck and 
Best Regards,
Roger

I have the Ricoh GR digital. I find it's a perfect travel companion with excellent IQ and wonderful operational ergonomics. I did not see the need to update mine. Given my experience with that camera, I was surprised about your comments on the need to replace it and the horror stories about the camera. Can you cite some sources? I've been recommending this camera to others and if there is something I've missed, I'd like to be informed.
 
On the X100+, I would buy instantly a XPro2 dressed up as a X100. I find the technology in my XPro2 to be extraordinary and sufficient. If I were to add anything on the X100(Pro2), I'd like a DOF scale on the lens. I really find the the size of the X100 (I have the original) a near perfect balance between button real estate and packaged technology. 
 
I do have the EF-X20 strobe for my XPro2, but still prefer just taking the GR (or X100) when I know I'm in a social situation that could be "spruced up" with a bit of direct light. I've never used it with the X100, because the on-board has always been sufficient for a bit of fill the way I shoot. 
 
There are enough things that the X100 does naturally that makes it a great complement (as well as spare body) to my XPro2, I have no hesitation to adopt a new X100 based on the XPro2 technology.

Interesting on how the door swings :-).. I still have my X100 and the firmware updates gave me a new/usable camera in a much broader usage space. I'm very please with Fuji's response to the X100 (but had to weather SAB).
 
Now I'm considering an update and have a X100T sitting in a popular retailer's outbox but I've decided to wait to see if Fuji will continue to support the X100T as they have their other lines. It sounds to me like they are moving the X100T to the back burner by delaying any firmware updates. To me the AF can't be good enough and that includes face detection, as there are others who use this camera. For me, I would like the focus peaking, but I understand that the improved EVF refresh rate and resolution has made the peaking more difficult to observe (in the EVF).
 
'll be watching to see whether Fuji's decisions are to keep the X100 series as part of the lineup or if this is the cycle where they will move on from the niche entry.
 
So the rumor of a firmware update can be the harbinger of longevity in the family or the lack of, an invitation to wait and see.