RMAs will help with the first scenario - they allow you to create fulfillments and bill credits directly without needing an item adjustment.