Use the latest file from Chimps and all files from Goalgerd and it should work (download extra content from Konami in-game as well).
Second question, yes when you add new Edit file from Chimps in the future it will overwrite your changes. But you can always put them back afterwards, should...