I never had mine done by the dealer and have never bothered to do it myself due to it being a pig of a job (as you have discovered). I just extended the pipe so as I can tuck it under the bash plate. This has the double effect of stopping the bung being pulled out off-road and it holds nearly four times as much oil (before it reaches air box level).

__________________