Have you looked at this guide: Guide To the Gauntlet Puzzle
Part 2 is for the maze. To me it was trial and error until it finally fell into place. It is doable. I played the game through twice and the second time was almost as difficult.
The shape you will get if you swap back to Hunrath will be the opposite bend to the one at the Maray maze now(example 90 degrees to left will be 90 degrees to right). If you want to keep it that way you need to find another way back to the Maray Maze. You can't swap back the same way you came or you will put the original shape back at the maze that you wanted to change..
I wish this was fresher in my mind, but I have lately been concentrating on Syberia 3.