yes, the address paypal will use in the emails, is the shipping address. if you selected the option not to include shipping, the shipping part of the checkout form will be left off.
I would delete the checkout pages and re run the checkout wizard. this time leave the option to include shipping checked, but you can leave the rates set at 0, this will include the shipping address portion of the checkout form.