I'd probably still think your Mozambican flag and herald look pretty communist, because of the hoe and the spear being joined together. Pretty hard to look at that without being reminded of the Hammer And Sickle.
The flag of the DDR would probably make an easy segue into non-Communist aesthetics. In fact, prior to researching it for this thread, I'm not sure if I knew there was a hammer in it, and might have thought that the whole thing was just an unusual sort of compass. So, maybe keep the compass(which probably symbolizes state planning or something, but is obscure enough to hide the partisan implications), replace the hammer with some historical symbol of Germany(I know, hard to do without godwinning the flag), and make the wheat sheaths into plain gold bands.