@meangreengrowinmachine I'd also evaluate the NFTG soil offerings - looks pretty promising and the standards they (claim) to self-impose on how they make both their soil and coco seems to be promising. Their #4 soil is something I've bought and examined and looks pretty good to me.
I'd consider a variant of both A & B -- buy some #4 for the goodies it brings to the mix and as a 'refresher' -- then amend lightly to get things to a modest 'super soil' level and let it cook.
I'd definitely do a soil test if playing around with re-amending so you aren't flying blind. A 'before' test will tell you what you need to be adding and if you can afford to I'd do a before/after to make sure it's not too hot afterwards.