Directly read the file by osm2pgsql instead of going through osmconvert
Switch to osmosis 0.43.1
Use own style.lua with addition of waterway to relation table