I would extra: avoid any activities which does not add any value to your thesis and obviously weight it against potential conflicts. Having PhD year earlier is better value, than year later with "better experience" (depends on situation, but having written thesis makes things little easier)
Indeed and if you feel that theres more work to be done along the lines of your thesis, funded advisors will often let you stay on for a while as a post doc. This can also help if you end up finishing without a job offer.
