Would it not be easy to extend shim to detect if setup-mode is enabled and place the keys into the UEFI key database in this case, otherwise just keep useing the MOK?
this way, we could get the best of both solutions: people who only want their own keys in the database can have it, the rest of us does not get annoyed too much with the boot process...