Another (mostly ex) Robotics guy here - I have a BSEE and a MSCS. If possible, I'd focus more on the coding side of your capabilities versus the mechanical side - there's just far more upside. People tend to pigeonhole MEs way more than CS (and pay them less).

You'll get a bump though for being able to turn a wrench - it definitely opens doors. What have you been putting yourself on the market as?