I think you are on track now.
For the 20% number, I believe that it should be on the same basis, ie all commercial price, all DIY or custom-made price. If you cross the line, then you need some adjustment.
Pls let me know which one you get and how the formula works.