I love the companion software, but I agree there are too many steps. (One of the huge downsides of HIP too!)
I would recommend leaving the initial (section) screen alone.
but when choosing the orange arrow at the right, get presented with the following screen.
This takes the functions intact from other areas of the app and lands them all on one screen, toggled by the selection processes on the screen.
The image/video/recording functions would be aligned to the comment that is being added/edited.
A new comment could be typed directly into the entry box, or the plus sign at the right to add a new auto-comment. The auto-comment filter (existing function) would overlay the radio button choices onto the spare space above the comment entry box.
any Existing entries would show up in a scroll box below the entry only if the drop down arrow to the left of the entry box is pressed. Selecting the radio button on the drop down would automatically switch the app to that comment and media selection.
All the other functions would stay intact and on their own screens.
This way all the functions you need for a selection would all be presented without having to screen hop unnecessarily.
This would save a lot of back-and-forth with the edit, new, itemised selection process. There no need to have a move item up/down in this section, because everything is in plain view, and any juggling can be done once the system is back on the desktop and being prepared for print/upload.