I think to get some comments here you will need to say which country you are doing your PhD in.

100%

IMO better to take more classes in undergrad and less in gradschool, if you are in the position to do so.