85 Cabby steering boss

Quick question guys.
I did a search and found a lot on spline adaptors and bearing splitters but not the direct answer I was looking for.

In short all ebay ads stat fits all Mk1 variants excluding cabrio and caddy which use a mk3 golf boss?

Is this correct, I was assuming because mine was early it would be the same larger spline boss that they all have?

Is a 24mm nut so I assume its the larger spline.

I'd rather just bolt a boss straight on and not be removing anything so I can return it to standard if needed