Jimny Gen3 low geared transfer case, push button.

I have swapped my low geared transfer case for an original geared one and is planning to open the low geared case and refurbish it if possible.
Not sure yet if the gears are too worn or if it is just the bearings. The case had approx 50000km on it before and 50000km after the low gears and, the noise has been there all the time after low gears was put in it and havent gotten significantly worse.
I swapped the chain earlier this year but still having a noise I would like to get rid of.
The noise is a bit less when overfilling the case oil level.

Now with the original case every noise is gone, so no doubt that my transfer case need attention.

I got the Trail Gear 87/17% kit but I can see now there are more options available like these: 
trialjimny.com/shop/en/25-jimny-jb53-1300cc-2005-2018

But not sure if the quality is any real difference between these, does anyone know?

I will most likely want to swap all the bearings if this case and the gears have enough life in them.
Does anyone know where to buy a decent rebuild kit with good quality bearings?
I have asked at Lamberts eng. what make those bearings are. 

The 17/87% gear set fits my car well and there is also room to go one tyre size up if I go insane.
So I would like to keep this solution or a similar setup. I would not go any lower as the revs on the highway is plenty high as is.

And before anyone ask, swapping to a SJ413 Samurai type case is not an option for me as there would be also need to swap the diffs and make a cradle and a driveshaft. Even though I have most of the parts needed.
I have calculated the final gear ratios and they would not fit my needs. 

No direct experience but I know for a fact that you can get a 1.5/6.0 set to go in the 1.3/2.6 case on the automatic so when I read on their site that their 1.3/4.6 set is the lowest you can get for a push button jimny it raises questions in my mind.

Opened the case during christmas and inspected the bearings. Some show slight signs of wear but nothing alarming with just barely any clearance. Only one needle bearing is too bad for me to put back in and some of the ball bearings has a very slight clearence and can be swapped just because I am at it. They all roll just fine.
The one needle bearing with some play can be the culprit to make the box make some noise but I am having difficulty sourcing it. Not much luck (yet) doing google and searching SKF and acc to my Suzuki dealer they are not in stock in the original suzuki warehouses so not possible to order sadly.

My options:

1. Put it back together and live with the noise until it breaks. Still got an extra case for spares.

2. Put all the low gears into my well functioning new to me used extra case and hope the noise stays in the old case.

3. Try to rework the gear wheels or shafts to fit an upsized needle bearing or try to make a bearing fit that i can source.

4. Change the diff gears, make a cradle, make a drive shaft and alot more to try to fit my 4.16 SJ low geared transfer case. (no, it is not a real option)


 
It is the needle bearing marked in pink no 15 I would really like to swap before putting back in.  
But since I am at it, all bearings at the main / output shaft can be swapped just because, if I could source them.
 

Whats your VIN number (PM me if you want)

I can see the needle bearing in the listings I have but the other parts on the end of the same shaft are different to your picture

I was sure I got the right service manual?
This is how my case look inside. 

My Vin:
JSAFJB43V00207657

No secret as all vin and plate numbers for all cars is available on line in Norway.

Part is £25 which probably equates to 10,000,000 Norwegian Krone   plus import duties to Norway (15,000,000 Krone) and postage to a supermarket in Norway that is nowhere near your home 

10 -15 days lead time as it is in 3rd level depot.

Martin