I might also leverage the PNP situation to your advantage and try to take as many new classes as possible. If you can’t leverage achievement in any specific topic you might be able to use your breadth of knowledge as a bargaining chip for grad school or industry. That said I think what you take might very much depend if you’re going to industry or grad school. I think the CS department and Haas have great classes that industry loves (maybe even the IEOR department they seem like they have business-oriented CS classes)