[OSM-newbies] 'Unpaved' and 'Unsurfaced' road tags

[Benjamin Van der Auwera]

Hi,

I've been mapping for about a year now in a tropical country, namely Sri 
Lanka.
Problem : a lot of the smaller residential roads are so altered by the 
monsoon weather that you can hardly drive on them, there are more holes 
and ditches than proper surfaced road ? However most of these roads used 
to be surfaced (either with tar or concrete) a few years back.

How should I tag these? Here are the different options I found  :
1. mark these roads as : highway='residential' AND surface='unpaved', 
2. highway='unsurfaced'
3. highway='track' and tracktype='grade1' or 'grade2'

of course, with option 2 and 3 we loose the residential tag , which is 
the most interesting property of the road, according to me.

Has anybody faced these choices elsewhere ? I would be very interested 
by your feedback.

Thanks
Benjamin