Re the part you said:
"we obey because He has made us righteous". That is powerful.
The scripture that comes to mind is
Romans 5:18-19 "...even so by the righteousness of one the free gift came upon all men unto justification of life. For as by one man's disobedience, many were made sinners, so by the obedience of one shall many be made righteous".
Excellent way to nutshell this 2000+ year-old concept.
Righteousness is a gift and grace is a gift, and they cannot be "worked" up.... they don't exist for us without Calvary.