Front locker and CV's

I want to put a front e-locker in and my wheels are only 215/70R16. I will probably go up to 235/75r15 once these wear out and will do transfer case gearing at the same time (probably the trail gear kit with 15% reduction in the high) when I bump to the larger wheel size. Right now it's not necessary.

I'm confused about the front spline count. I know on samurais it's 22 in the front and trail gear says 22 in the front for JB43's but the CV wiki says 26 and I confirmed with my VIN and the part number on partsouq.com.

Second question is Birfield rings or upgrading to cromoly shafts. Around when do you need to switch? I've read somewhere between 30" to 33" is when things start breaking. Obviously a locker, tire type and traction of the surface play a part. 

I ask all this because if it's a 22 spline front gear and I get a 22 spline locker, start breaking CV's then need to uprate to chromoly axles that are 33 spline, I need a new locker as well. I don't really want to keep opening up the front axle if I don't have to (just rebuilt last year). I know there's a 22 spline uprated chromoly shaft so the 26 spline side gears aren't 100% necessary. 

Share your thoughts!

I have the Longfield shafts and cv's 
I went with 26 spline 
The 22 spline uses the same robust cv joint 
So only possible issue I could see is 22 spline halfshaft may suffer from twisting at the diff side 

Your driving style will play a great part in any breakages 

Also there a pain to fit 🤔 the actual size difference is very noticeable 🤣

Do you think aftermarket 22 spline shafts will be much weaker than 26 spline?

Kaiser front locker with 22 spline Longfield fitted the guys never had issues 
Arb in another guys with standard shafts /cv's never had issues 

It's all down to driving styles....... When mine starts bouncing on the spot I try a different line 

Jack