That could be a nice neo-retro project, with the Bora 2! It hapened similar to me ; once you've tried a neo-retro, it's difficult to go back .....
For the headset, you can go with Chris King 1" ahead hedaset for example. Cane Creek , FSA or S2 have 1" models too in black. If you want to stick...