I suggest you get some koolstop pads and just try these. If you are still unhappy consider dual calipers or another bike. Teflon coated inners make a difference on long cable runs on folders. But bit of a hassle and may not be an upgrade to take to your next bike.
If you do get a new bike you have upgraded pads available