Sounds like you've definitely replaced the components which would trigger your Infiniti's Trouble Code P0011 and P0012 problems. At this point you would be eligible for a one-time two year smog check exemption however the State may require you go through the CAP Repair (Consumer Assistance Program) if you are eligible.
Call (800) 622-7733. You'll need to have your 2004 Infinity G35 inspected by a State Smog Check Referee's Office. If you meet the State low-income or cost waiver criteria, the Referee's Office may grant you the one time waiver.