You are correct, having both address blocks set to the same address space is very confusing for your workstation. The actual problem is more gateway related, as your machine now has two gateways with (likely) the same IP address.
There is no good way to get that to work using the same IP range on both the local and remote networks.
Note that I said "Good way" I'm certain it's possible, just more trouble than it's worth.