You see what you're doing is you're trying to take away reasons for using a mechanic you don't like. Unfortunately though you'll take away everyone's reasons for using a feature that is in all ships.
Let's say FSS stays as is, ADS is re-added and you carry it. You will get discovery data (shortcut) from FSS but it won't tell you anything you don't know from your ADS. So you're reducing the FSS to 'just a way to get paid' and you already think it's a chore. It should therefore be be the ONLY way to get paid, and then using the mechanic has a value. I would take off honk payment and also potentially allow discovery but remove payment from the passive (point and wait) scan.
Now you have a more active reason - follow the money - to use FSS because it puts clear water between it and ADS.
I understand your logic but we already have what you describe - albeit with a relatively low payout for the honk, a bit more for a scan (by whatever method) and the lion's share coming from Mapping bodies. The ADS being on-board would not change any of that, just as it works right now in pre-explored systems.