AFCIs not required where GFCIs are required.
Siemens has the new combination AFCIs on the market.

Sounds like you are trying to do it right - in spite of the learned locals. Good for you.

This was from a post earlier today
Award-Winning Combination Type Arc Fault Circuit Interrupter from Siemens is Now Available