Before doing then maybe make an Image with a tool like Macrium Reflect. I wonder why two?

Now I would never push anyone away from the forum but have you checked the HP site. You may be an earlier adopter for the Creators update but I would think other owners would be running into the same issue as you.