There is something you can do that makes saving files a little easier in the Organizer. This will work for editing single files or even multiple files for which you want to make the same edit e.g. improve the exposure or color or clarity.
- Select one or more files for editing in the Organizer
- Click on the Instant Fix button.

This will bring up the Instant Fix editor:

- Using the view button, you can work on a single photo or multiple photos.
- There are several editing tools. But you can only use the crop tool for one photo at a time.
- When you are done, click the Save/Done button. The Save button will save the edited file as an automatically renamed jpeg in a Version Set with the Original photo. With or without clicking the Save button, you have to click the Done button. You will be prompted to save your edits (if they have not been previously saved). Click Yes and the file is saved in a Version Set - with the edited file appearing on top of the stack.
No fuss, no muss!
The Instant Fix is a great tool and I use it frequently for quick edits.
Now as for HEIC files, Elements can handle them (if you install a free Microsoft Extension). But IMO if you have found a solution to transfer them to your computer as jpegs, there is no reason to change your workflow. The Instant Fix tool can handle HEIC files and also raw files. It will save edits to both as jpegs.
One final note, in order to unstack the version set so that you can see both the original image and the edited one, you need to be in the Organizer's Details view. Press Ctrl+D to toggle between the default view and the Details view. With that, I will try not to overwhelm you further with new information.