Modern Kato Wheels

[RailfreightTom]

Evening all.  I'm thinking about pre-ordering the Kato Class 800 but I have code 40 track from BritishFinescale on my layout and my previous Kato purchase (a Eurostar in 2010) has pizza cutter wheels and doesn't like the code 40 track, does anyone know whether recent Kato releases have improved lower-profile wheel-sets?

If not can you buy replacement wheel-sets for Kato stock?