Looks like Pure has the HF and 2+ for sale on their site, same $ as the S54's were except the core charge is hella expensive. I'd likely opt to send them mine first in exchange. If they do to the S58 what they did to my S55 engine, they are worth every penny!
https://www.pureturbos.com/store/bmw...8-stage-2.html