Are undergrad professors the be-all end-all for MS recommendation letters?
Request both. Then, use a combination of them tailored to what position you're applying for. An academic position may call for the academic-heavy reference list, whereas an industry position or a position where someone of influence is acquainted with one of your recommenders, would perhaps change that equation.