Resetting CMOS and replacing the battery made no difference. When I turned off CSM the system would only boot to the UEFI screen and no further.
What finally worked was disconnecting all hard drives except the SSD. Then the SSD showed up in the boot priority list and I was able to select it and save it. After reconnecting all the disks the system boots fine now.
Thanks for the replies and the interest.
Dean