My understanding is that the combo from Expertise is based on your current weapon's type. I noticed that the combo does not change if you change your weapon.

Steps to reproduce:
1. Begin combat while unarmed
2. "analyze flame" (it gives an unarmed combo as expected)
3. Wield a weapon
4. "analyze flame" again
Expected: I have a new combo available based on the type of the weapon I equipped in step 3
Actual: I still have the unarmed combo available