Staff of Flying

Simply put, I would reskin the Broom of Flying into a Staff of Flying.  The staff would serve both as an arcane focus and as a quarterstaff.