I think you'll prefer option B
since you'll be driving it in traffic often
but either will be OK.
Its not like it'll be some cantankerous mule like a carby-fuelled beast.
swapping in a phenolic spacer later on isn't a big deal.
I'd see how you go with T-VIS first
especially considering that you'll be running in the new motor
for a week or 2,I'm sure you'll find some free time available in a couple of months
to swap it if you think its what you want.