XX CR Chassis

[FasterLouder]

So, I had this NIP XX CR body laying around and a XX came up for sale, locally.
Figured between that car and the parts I have, I could finally use that sweet body.
Seems the graphite chassis I have is a short one-it has an 'S' stamped on it and the front body holes are a little too far forward of the one on the chassis.
That little white dot on the body in the photo is the factory body mount hole.
Would a XXT chassis be the correct length?

Man, rear 5 spoke wheels are getting hard to find!

Thanks!

~Faster.