I have a 1996 cbr600f3 which I use as a track bike and very occasionally on the road (mostly if I am scrubbing in fresh tyres or trying out a new mod before the track) anyhow just back from a track day yesterday and was battling with sports 600's (zx6r and cbr6rr's) quite well but where I felt the bike was struggling against its modern counterparts was in the braking zone. I am currently running standard discs with ebc pad and stainless steel brake lines plus fresh brake fluid was used when new lines were installed. My question is what can I do to to improve the brakes on my bike? Is there any better calipers/ master cyclinders that can be changed out to increase performance etc? I know wavy discs would probably be better but don't see them being that much of an improvement...

Bear in mind this track bike is suppose to be a bit of cheap fun and I am not looking to throw silly money at it but perhaps ebay might be able to help?

any suggestions?