You are correct. I was curious and ran a search of all verses that contain "righteous" and its derivatives and then searched for "just" and its derivatives in them, to get to the bottom of it. Justification is always declared before judges. Justification before God is God's judgment, whether final judgment of soul, or during life, awarding favor vs calamity, blessing vs curse, etc. God's judgment is giving wages according to works, exalting, smiting down, casting out, lifting up, all that. Justification definition by the Bible itself (in bold):
2 Chronicles 6:23 Then hear thou from heaven, and do, and judge thy servants, by requiting the wicked, by recompensing his way upon his own head; and by justifying the righteous, by
giving him according to his righteousness.
So justification (and conversely condemnation) is defined as "act of God's judgment and meting out wages accordingly", in case of justification, wages of righteousness. So unrighteousness predates condemnation and righteousness predates justification. A believer will show fruits of the Spirit which isnt their own work, the just receive the Spirit and conversely His righteousness by faith. And no one can be justified by works because we would all receive death wage for sins committed. And that unrighteous sinner must be buried in baptism because God can't leave a sinner alive. So that's that subtle difference but it doesn't really change things, it's the same people.
The righteous are without exception the ones, and also the only ones, who receive justification as the wages of righteousness, regardless of the covenant. Obviously there is no righteous person who is not also justified, either. God sees and judges all things without skipping.
@know1