Combo + stat help

Hi all ,
I'm level 93 and I farmed 1mp combo for a long time. Now I have a lot of cp and wondering if someone can suggest some combos .. a 2mp combo along with a 3mp. With mp potion I have 1100 mana rigjt now.

Also have stats question next

I'm full str , and my skills are as follows :
1mp charge
5HH
10 astute
6 trigger
1 rampage
5sonic
5 spiral
10 tempest
5 sword mastery
10 quick slash
10 sword techniques
7 impact (I did 5 5 5 and then 7 to get it)
5 smash
5 bash
10 shell break
1 quick aura
Also aiming to get 1 holy fist and 1 war cry ? Not sure yet.

My current combo seems to do lots of dps- it's HH shellbreak(save) astute (consec) trigger (consec) impact (consec) tempest (smite)

^ this is roughly a bit over 1mp combo. I like it but need a 2nd one . This is my current second one I came up with:

Astute spiral (save) trigger (smite) sonic (consec) she'll break (consec) ... I forget if it's 300 or 400 mp. I use it as mp dump when she'll break procs!

My first yhing i nedd help with is:

1) what skills next ? Max war cry ? Or the passives i havent maxed? Get holy fist? No sure whrre to go next.

2) is my 1st combo good ? And my second? Any suggestions on anothrr 2mp combo would be great, even with war cry , holy fist etc. If im advised to get them. I like quick aura but my likelihood of dying skyrockets in boss battles (only have 3k hp with vita +). Also , should I be using rampage at the end of the combos??

3) I'm almost maxed on str , and thinking of going crit next. How much crit stat points should I get ? Or is attack speed more important? I miss a lot it seems.

3) bit of an aside but right now I wear knight helmet with +150mp - stats are hp300, def 10% , 4% physical . Any other better helmets ? My hp isn't that high btw.
And my ring is sofya ring still with +150mp.


Thank you all for your inputs I really appreciate it !!