I used FedUp to upgrade, and the issue went away completely.
The current kernel is 4.0.4 and every boot works fine.
Thanks for your thoughts and suggestions.
Ask Fedora is community maintained and Red Hat or Fedora Project is not responsible for content. Content on this site is licensed under a CC-BY-SA 3.0 license.