I know how complex it might be however are you able to add KNdS geometry (Kerr Newman de Sitter) too increase accuracy and more.