0.89 should have this sorted for you: you will be able to set Pathfinding to 'Custom' mode, where you manually specify with actions the object types to navigate around. You could use Solid for land units and make your own attribute, 'Land' say, for naval units.