Okay after fleshing this out with Geoff Mandel over Enterprise cartography we came to some interesting data.
The Rigel in Enterprise is the same Rigel in TNG known as Rigel IV. Yet not being the Rigel from TOS which is the real Rigel at 700 odd lightyears.
So the close Rigel in Enterprise will become the Federation member world of Rigel IV. And here's a star:
Rijl al Awwa aka Mu Virginis at around 60 light years (40,-10,40) (rough cordinates, data not to hand).
Now Rijl currupts real nicely into Rijil and thus Rigel.
The Rigel from TOS is a border/outskirts/colonial type place. So the real Rigel at around 700 ly fits the bill.
As for Deneb; one of the close ones for the Federation member world. Perhaps Denebola at 37 odd ly or one of the other close Denebs.
The Deneb in TNG IMHO is the real Deneb at 1600 ly (old but Trek orientated data. Hipparchus blows this out to 3000+ ly)