Just what I needed!

But there are a couple of issues:

1. "current-menu-item" class is converted to selected="selected" too soon. It should take place after the "nav_menu_css_class" filter. Here’s why.
2. "items_wrap" (from wp_nav_menu) is a useless option now that you’ve overridden it. If there is no way around this, what about adding an items_wrap2 or similar to preserve functionality?

Thanks!