I would recommend JOSM (http://josm.openstreetmap.de/) which is Java-based and I find much faster and easier to use than the web-based Potlatch or iD. However, try out iD (the one you get on the website when clicking the 'Edit' button) and see if it works for you.