Statefull firewall inspection (check)
Segmentaiton of CDE and non-CDE data (check)
WPA/WPA2 encryption on CDE network (check I assume??)
Assuming you're also doing rogue detection you should be compliant.
This question was posted a while ago, so I assume you figured it out. Can you reply back with your experience in making sure your network was PCI compliant?