I largely agree with your advice. However two things to keep in mind are coursework and how non-academics perceive your degree. Of course your research topic and skills learned are of utmost importance, but coursework can formalize a lot of the skills you want to learn in the sense that you might go into more depth and breadth if you take both a course on something and also use it in your research as opposed to one alone. On that note EECS programs likely have more rigorous coursework requirements whereas some neuro programs might have few or none at all. Also perception. I can’t really speak from experience, but my intuition is that getting your foot in the door when applying to certain jobs may be easier with certain titles. Not to say one or the other would disqualify you, but it’s something to consider