This last year I gave up mechs. I am a Creative Director and have to use other computers sometimes. I became so dependent on the hhkb layout that I was lost when using other's computers.
I decided to go back to a normal layout. I picked up a logitech bluetooth keyboard and bring it with me. I also purposely use my MacBook Pro keyboard at least one day a week just to stay used to it.
It has helped my workflow not having to think about different layouts. I am thinking about jumping back in to one of the logitech mx bt boards.
What are you using? Have you made any changes?