Homeport with GPSMAP 640 - Always changes to Auto Mode

I have a 640 that has both Marine and road maps... Not that I need the road maps but that is the way it came....
The issue is that when I use it with Homeport, Homeport places it in road/car mode which then doesn't let me download or upload waypoints or tracks in the Marine mode.
I initially installed HomePort on a Windows 7 machine to see whether it was worth using... During the test I was able to download my waypoints... Liked what I saw so I installed it on my Windows 10 home system. That is when I noticed I could not download my waypoints. If I place the 640 in marine mode and connect it... then unplug it, it comes up in road mode. It should always come up in the mode you shut it down in...
When it is connected I can download my favorite road locations and upload new ones.
This issue is definitely something that is causing the access to be directed to the road system
I thought it might have to do with having Garmin Express loaded.... so I loaded it on a Surface 3 Pro with Windows 8.1. The exact same thing happens...
I will take it to work tomorrow and test it again to verify it works with Windows 7.
Anyone else run into this issue or have any ideas....

3/21..... Tried this at work and the same problem.... My waypoints were still in HomePort but when I tried to reload them from the GPS there was nothing. The only thing I can think of is that I did not have the supplemental card installed when I tested it and somehow through reading he databases it was in Marine mode, because it did allow me to import all my waypoints.

At this point I can do no trip planning....

Would be great to solve this.... but also any work around would be helpful also... Is there a way to move waypoints and routes as a file onto the GPS??