Hi DeltaMac and thanks for your reply. When I hold "OPTION" at boot, I get MAC OS, Recovery HD and Windows. That means there is one more, could be the EFI partition. The MAC side seems to boot but I have to get a password for that. Windows goes into "Automatic Repair" and never repairs itself. I've now had my fingers in there with Win utilities like BOOTREC for repairing Windows boot files (BCD) so that complicates things.
I'm guessing my next step would be to get into MAC OS and work with Bootcamp software to see if it can straighten it up? I don't have a re-install disk for Windows so I'd like to fix if possible. I've fixed stuff like this before but not when complicated by bootcamp.
The Option bootpicker screen is displaying properly. It shows any bootable partitions. You will NEVER see the EFI partition there, as it is just a boot support partition, and not bootable itself.
You have two very different operating systems, each with their own partition requirements. You need software that will know that both operating systems are there.
Paragon software has some good stuff -
https://www.paragon-software.com/home/bootcamp-backup/
Boot Camp does not have any kind of repair function. It's main purpose is to create a partition with a size that you determine, and to prepare it for a Windows install.
If the windows partition already exists, then Boot Camp Assistant will provide a choice to remove the partition completely, and restore the space to the OS X partition. That's assuming that no other modifications to the partitions takes place, such as additional partitions, or changing the partition map in Disk Utility. That will often mean that you have no other choice than trying to repair the Windows installation - which, in turn, means that you need a Windows7 installer. That MAY be something that you will need in any case, as you may need to backup the Windows partition, using your fav Windows backup software, AND backing up the OS X system, too. Something like Carbon Copy Cloner, or SuperDuper! are both good choices for that, if you need it.
And, then reformat, reinstall OS X, restore the OS X partition and software, create the boot camp partition again, and restore the Windows partition. You will probably still need the Windows installer before you are done with all that.... (Whew!)
But - you should also try searching for your issue (Windows 7 Boot Camp boots to automatic repair, or something similar)
This thread might even get you going -
https://discussions.apple.com/thread/5379138?tstart=0
Note that one or more of the fixes says to boot to the Win7 installer, and run a repair on the Windows partition. Make sure that you choose the Windows partition, and not the OS X partition
Lots of info in this post, hope it doesn't just confuse you more....