I think I'm getting the hang of JOSM now. I've tidied up all my untagged roads and fixed up all the outstanding cross-overs. I think I'm beginning to understand where I should differentiate between highway=unclassified and =residential and =service.