Had a similar situation (a Windows and a MBP) and just putting VMWare and Windows 10 on the MBP solved pretty much all the problems of having to lug around two machines.
There's a Citrix setup as well, which while slow works fine for the one or two times a month that I need access to encrypted email... so I haven't carried around the Windows laptop.
