I would probably go with 2 hours then.....
As for arriving, I've found about an hour before the flight to be fine, by the time you get though check in and security, you'll probably only end up hanging around for about 10 minutes before boarding starts.
I would probably go with 2 hours then.....
I usually do about the following;
1 hour domestic
2 hours Europe
3 hours Long Haul