Targeting specific devices, screen sizes or orientations is the wrong approach, as is using device-width rather than just width, don’t do it.
Always create queries at a point that your design requires it. This way is much simpler and should work for any device, not just the few of the thousands that you choose to cater for.