Dave,
your proposal would be a little bit better, but still not correct, unfortunately. The correct designation after Dec 1916 would be
Königlich Preußische Jagdstaffel "Boelcke", without the number 2.
I have checked with Georg Neumann's "Die gesamten deutschen Luftstreitkräfte im 1. Weltkrieg", and he always refers to Jagdstaffel Boelcke, abbreviated to "JaSta B". As Neumann was KoGenLuft, I really doubt he would write that specific designation down incorrectly, because JaSta B was the only Jagdstaffel to be given a Name. Jagdgeschwader Nr. 1 "Richthofen" was a) a Jagdgeschwader and not a single Staffel, and b) always kept it's number in addition to the name.
(This is why JG2 Richthofen of WW2 was called JG2, as it was the second Jagdgeschwader with the honorary name of MvR.)
Regards,
Stefan