Should I include ions from the solvent in solubility product constant calculations?
Yes, absolutely, all nitrate counts in solubility product regardless of source. The system cannot distinguish what a nitrate ion (or any dissociated species) was bonded to before it dissociated.