You can find a JG or Echo 1 G36 on from any airsoft store. You also shouldn't hate Echo1 because your KS P90 was bad, chances are that it was a lemon, all E1 does is rebrand. Which means they give it a good shimjob, change out some internals, and make sure that you're not getting a lemon.
KWA and G&G are pretty much the best guns you can get for under 800. If you've got money and you want quality stock internals and externals, get one.