French v German: I did both to degree level, then lived in France, Germany and Austria. I feel I am still learning French, though I 've been able to speak it for 15 years now - it's a bit like English, full of exceptions, flavours, nuances and ambiguity. German took me a while to get used to, but after you have learned the 'system' then it is mostly a question of slotting in new words/ideas into the system that took ages to learn.
After a year of each, I would venture that your French would be better than your German, but after 2 years that would probably have changed as you've now got to grips with the German structure. I speak German quite happily, but I still prefer French.
BTW, I then went on to learn some Swedish and agree with Gooner that it's reasonably straightforward (!) after English/German, then I did some Spanish, and then British sign language. Once you've learned 'how to learn a language', each new one is easier than the last. I do get confused at times, especially when I know a word in (e.g.) French, but actually need it in Spanish, but overall I've only made a complete tw*t of myself a few... hundred... times