Hi Martin - I'm sorry to hear there is such a long lead-time. This is the problem with a high quality, well-engineered product and finite factory production resources. If you can bear to wait it will be worth it but otherwise the only option is to buy second-hand and uprate it. As somebody has remarked on here there are a lot of kits that have been bought over the last few years but which never seem to see the light of day (unless they are in very long-term build!) It might be worth you making some enquiries of these kits.