Similar development with my group. I've come to enjoy RPing a lot more than combat, which actually takes us much more time to calculate with all the higher-level abilities than improvising NPCs on the spot. But I know fighting will still be inevitable in the future, so we're blending in some rules from Worlds Without Number and home-brew to speed it up in the future.