Also, when you say computational scientist, do you want to go into something specific? Computational political science? Computational biology? Theoretical computer science?
Programming is usually something that bright people can pick up on their own, with the help of online tutorials and books. It seems like you've already started. If you want to go into something that requires domain-specific knowledge, you might consider doing a second master's - depending on the subject, your school may not require a specific undergraduate degree to get in, and in my experience you learn a lot more working with an advisor one on one vs. learning in large class settings. Also, two years instead of four.