My personal suggestion MEP is the best choice for mechanical engineers. Why means this field can provide good knowledge, good income, job satisfaction etc..

So you can learn AutoCAD for 2D and Revit MEP for 3d services.