Network operator selection
This previous question How to force network operator selection once and for all? suggests that an app called APN Lock should allow you to lock your network to the correct one. You'd need to change the settings on it to change which network it locks to whenever you move between the countries, but hopefully you're not doing that every day?