You've got a decent bike, as-is. I'd say to either a) go for a clear upgrade (and you don't seem to think that either of these is really much of a clear upgrade) or b) go for something that'll provide a different feel and/or utility (like a gravel bike that can double as an endurance bike when you pop slicks on it).