I'm sure you're already aware if you're in the G36 Market but TommyBuilt Tactical makes some of the best G36 conversions you can get your hands on. Not local but if you don't have any luck finding a local source that's a solid option.