FYI CA wants to help you pass smog. They offer a $500 assistance to perform all the things you did. No income limit just sign up and go to a gold standard repair shop. You may also need to test at a test only shop.
My NO levels were only a few 100 over and all it took was the tester let the car warm up 10 min before the test. (I also ran it for 30 min). He said need a hot Cat for BMWs to pass. Other pre test items are new plugs, check for Vacuum leaks, injector cleaner and Seafoam cylinders for carbon.