What's the easiest way to transfer photos from Google Photos to iCloud Photos? I have more than 5 000 photos stored on Google Photos and I'd like to know what's the easiest way to move them on iCloud photos. Since the free storage ends on June I want to move everything on iCloud.
Here's what I've tried :

Selecting all of them on the Google Photos app and downloading them, but it randomly skips some pictures, and it stops after some hours of download. Since it downloads them in a random order I have to delete them all and start over.
Downloading them from Google Takeout and uploading them from icloud.com on a PC, but it only accepts JPEG files, so most of the pictures are not uploaded (the file format is .HEIC) and videos are skipped.

I have no other idea on how to do this, I hope anyone can help!
You can download the photos from Google to your PC and then upload them to icloud.com