I was looking at similar bikes when I was looking. Have you considered a first generation Yamaha FZ1? Heresy, I know. But it's a liquid cooled engine with a bit larger fairing, comfortable ergos, and if you hit it just right, you can find one in that awesome bumblebee paint scheme. That was 2003 or 2004.
H