I am in a similar situation like you. Can't you just keep the German insurance? After some discussions with my German insurance company, it turned out that it was possible to keep it. I have a thread here about it:

German car, insurance and customs