It's funny, I'm pretty aligned with your thoughts, just like you, I'm on the back end of my commercial life (went full time in 1993) and have always been pragmatic with gear.
I want to splash out once before it's not relevant anymore!
I too am shooting on the S1R2 and love the files out of it.
And yes if I ever get an SL3P, the first thing is to black out, sorry stealth out the white Logo 🙂