If you're having to mount drives in Ubuntu's recovery mode, something is really f*cked up. If you can remember the default state, I would try and revert back to that first before making any changes. (Hopefully you don't have to reinstall anything)
I'm not familiar with gnome-disks, so I can't say anything about its own file relationships and how that works with GRUB.
From past experience, most Linux distributions will place your EFI partition (looks like it's at /dev/nvme0n1p1 in your example) at /boot/efi. /boot partitions generally aren't really needed for a home linux environment afaik, but I'm sure someone with more experience will be happy to come along and give an example of when you might need one. However, in order for Linux to boot up successfully, it does need to know where all of its internal components are (typically the kernel and an initramfs, if you have one - I think Ubuntu ships with one by default).
If you're looking to just have the EFI partition mounted correctly, you can unmount it temporarily (as root, so exercise caution) and then make changes with the directory structure before remounting it. Your fstab file should match up with where you want it mounted.