7.5k for oils & filters, valves at 15k sounds about right, keep an eye on the water pump.
If it's been sitting for a while and not serviced I would go for a short 200kms? ride then do all the fluids, oil, coolant, brakes & clutch. Do all the filters at the same time.
It's a nice looking bike Joe, well done!
Bookmarks