if you've got a fork that requires a 21.1 stem, you're dealing with "american" components. you can replace the fork with a regular road fork.
you'll need to modify or replace the headset locknut though.
and get a new stem

so why bother?