Thanks man. That does clarify things quite a bit.
For your type of goals, I think you can actually go for either degree. If you look at mid-management positions, you will find people from MBAs and MSes in these positions. So really, either could work for you. An MS will likely keep your future more locked in on the technical side (although you can advance a lot) an MBA will likely move you over more to general management stuff (but still within tech). It could of course go either way, depending on the circumstances, but basically, this is the skillset you would be training for in one versus the other. It is a bit easier to figure out if you know EXACTLY what position you are aiming for (and here I mean title and department) because then you can look at people in similar positions, and see what they have on their resume. So for which diploma, it's a bit of a tossup depending on how specific you are getting for your goals. The next question is what you really want to learn??? Are you still interesting in deepening your tech knowledge? Or would you rather leave that be in order to develop on something else?
If you like the post, give it a KUDOS!