I'd use the 1.21. With the modifications you've made it should be ok if you can get the right jets and power vavle in there.
Back in the day I went back and forth with Michael Ehrmann (ebay MC2100 guy) and he suggested using one 48 and one 49 jet in my tan CJ with a 1.21 MC2100. I described my engine as rebuilt .030 over, Borla header, Dynomax muffler (which I haven't ever gotten around to installing), and TFI ignition (Team Rush). He did say that the power valve is important, and to determine the proper power valve to take the manifold vacuum reading at idle, divide by 2, and then subtract 2.
For example, if at idle your manifold vacuum was 16HG, divide by 2= 8
8-2=6
Also said that jetting depends on humidity and elevation. I'm at about 225 feet ASL, in the humid Arkansas Delta.
My suggestion would be to play with it. He suggested 47's in my 1.08 equipped Jeep with stock engine, and I ended up using 46's and it runs great, so a little trial and error is the best way to go, but a 1.21 can be run on a 258, especially with other upgrades.
So you would need a 6HG power valve.
I won't pretend to understand all of that, just repeating what I found in an old email from him from back in 2007.