Keep the B60 this time. With pre-out/main-in and a tape loop, you can always find a use for this amp. I like the B100 more, but only for its remote control capabilities.
I noticed the 2B-LP under the BHA1. I've had both, but not at the same time. Aside from the connectivity and controls on the BHA1, I actually preferred the sound of the 2B-LP for headphone use. Have you compared the two? Thoughts?