G'day Scotty,
I am in a similar position to you. Similar accessories and looking to do a 2 inch lift. I have also read the threads on here about the issues when lifting a Puma, but I believe there are solutions too.
I am leaning towards going to Les Richmond for the reason you mentioned and in discussing my needs with them. They rate Koni as number one and Billies number 2 - but that both are excellent.
I'm interested in why you are state "The shock decision seems easy, Terrafirma Big Bores".
Whilst I am sure they are a good product, my research on line on this forum, and in discussing with various outlets, the Koni is the first choice, closely followed by Bilstein.
Most people say that Koni is best, but I was told that the Koni Raids may be too harsh for on road by one specialist, and that Bilsteins would suit the Defender better. They also sold both and Billies are cheaper so it was an interesting perspective.
Haven't decided what to do myself yet.
Nigel
Bookmarks