Recommended upgrade procedure to avoid drm-kmod panic on 15.1-RELEASE

Dear freebsd-stable,

I recently upgraded my desktop system from 15.0-RELEASE to 15.1-RELEASE 
using freebsd-update(8), and encountered a kernel panic on the first 
reboot after the first 'freebsd-update install'.

The panic was caused by drm-66-kmod, which was installed from a binary 
package built against the 15.0 kernel. After the kernel was updated to 
15.1, the module could no longer be loaded.

I was able to recover by following these steps:

1. Booted into the previous Boot Environment created before the upgrade.
2. Commented out kld_list and the display manager entry in /etc/rc.conf 
to boot into console mode.
3. Rebooted.
4. Ran 'freebsd-update install' for the second time to update userland.
5. Removed drm-66-kmod installed from pkg, then rebuilt and installed it 
from ports (graphics/drm-66-kmod).
6. Restored /etc/rc.conf and rebooted successfully.

I also found that all kernel modules listed by 'pkg info | grep kmod' 
require rebuilding from ports after a point release upgrade. In my case, 
emulators/virtualbox-ose-kmod was also affected.

This procedure worked for me, but it requires knowledge of Boot 
Environments, ports, and manual kernel module management. I am not sure 
this is something a less experienced FreeBSD user could handle without 
difficulty.

Is there a simpler or more beginner-friendly procedure recommended for 
upgrading between point releases when drm-kmod or other kernel modules 
are installed from packages?

Thank you for your time.

Best regards

Takashi Shimizu