Hey cool - glad to see James being used as well. Hopefully the JMAP support that Linagora have worked on will mean that you can bring JMAP eventually too.
I hope you don't find the pain of diverging from the mainline to be too great. We kind of cheated there with Fastmail and Cyrus IMAP by merging all our changes back to the mainline, since there wasn't much other development happening.