Hey Ben, didn't you know new BB7s are practically free?
Less than $40 for 160mm. Each year the prices keep falling on these things, granted the rotors are cheaper but you run your discs brakes looser than I do so maybe it won't bug you.
also what is a "31.8 HB"
Don't forget another one other bike related event to look forward to in winter.