Trunks - Preferred SIP driver

Should I be looking to move my trunks over to PJSIP or should I leave them as chan_sip.

If pjsip is the recommended poison I have another question.

I have the following set for CHAN_SIP
progressinband=no

This means that I get the right ring tone when calling locally and more than that there are very often “fun tones” meaning the ring is special and I would like to make sure I continue to get those rings, and not just a plain ring. Is there any way to do this with pjsip at this time?

It seems to me I want to be able to change the following setting which I believe got committed to the code

inband_progress

but unfortunately I am not able to adjust it all with FreePBX currently.