One suggestion, if your on a buget try to avoid the basket cases.
Bikes pass through a point where they have little value but are still great, that will be what your looking for. Can you not keep the ybr for the daily grind then get something that will light the blood on a weekend.
Commuters are great and all but, well, they are commuters, the Mondeo's of the motorcycle world. An FZR600, maybe a GSXR400 (bloke I work with does 50 miles a day on his GSXR400 year round). They can be bought for under a grand for a tidy one. They could still get you to work but you would have a silly grin when you got there, then when the weather is cack, take the YBR as fast don't matter then. Maybe a 2 stroke (im biased) A 350b would do all you need or an XS400 is a good blend of economy and go.
Just don't get trapped by the showroom lights, there are a lot of tidy classics out there for not much. Also it is FAR too easy to get caught speeding these days to. I deliberately picked a bike that is at its best between 60 and 90. Downsizing from a 600.