To capture all employer match, ended up contributing after-tax over the limit funds to 401K in 2016. Was able to roll these into a ROTH IRA.