This looks broadly like what I did, yup. I put the mix into an oversize carboy because I didn't have anything smaller, so I didn't add water to 3" below the neck, but essentially, yes, this is very similar to what I did.
Oh, interesting. I hadn't considered the citric acid. Is there a way to...