G'day OP, your signature still says "Insert future Macbook" does that mean you returned the MacBook Pro? You got the Pro with the TB right? I am weighing up between a MB and a MBP 13tb, currently have an 11 inch Air, and I want a retina screen.
If you can hold out until WWDC you may be in luck, although there is reason to believe that it'll be early 2019 until a new MB with cannonlake, but I hope they spec up the processor on these ones between now and then.
the 2017 MB has a redesigned keyboard, not sure if you've tried that one? you can also get a plug in 'magsafe like' adapter, with 1 port thought it may be annoying, possibly I'd explore getting a dock then using the magsafe adapter through that.
Btw, they're all third party, it wouldn't be compatible with old chargers which makes me sad, but still.