2024 Ninja 500 (451cc stock) - mods and rules questions

I just purchased a salvage titled 2024 Ninja 500. Trying to decide which way to go with it for the 2025 season and want to make sure I understand the rules properly.

For D Superbike from the rulebook: "Up to 600cc air-cooled multis & water cooled twins with more than 3 valves"

So I think it is eligible for D Superbike at the stock 451cc.

Also, if I bored it +2mm to reach 476cc, is that D Superbike legal?

I think the 476 cc Ninja 500 would technically be legal for:
D Superbike Novice/Expert
Clubman Novice/Expert
Lightweight Twins Novice/Expert
Formula 2 Novice/Expert

Please let me know if I am reading this correctly.

Thanks.

 

Thanks Sean!