For anyone coming across this thread recently, why is the obvious answer here not aftermarket shops? Like Rigo Garage or Patterson Performance where I'm at in El Paso. Almost any major city has shops like this, and lucky for me Patterson specializes in boxer engines. Just do some research. If you don't want to go the dealer route (who would?) and don't have the time/tools to rock it yourself, it's the blatantly clear option.