I decided to go with Mike Willis of Protech Film Solutions in Oakville (
Protech Film Solutions | Automotive Paint Protection Film and Window Tinting), based on some recommendations over on the BMW forums. I had him remove the factory paint armor on the hood and replace it with full coverage.
He did the work this morning, and the full coverage of the hood including wrap around means that it is now completely invisible, just like it was on my Roadster. I also saw some of his work on a new Infiniti, and it looked amazing.
Based on what I have seen, I would not recommend that future purchasers get the paint armor from Tesla. It seems that the aftermarket people do a much better job.