That's some nice documentation - way overkill for what I need though.
Out of interest - Why is the VPS required, and why the mention of a non residential IP address? Could that not all be hosted locally if your ISP has given you a static IP address?
what benefit does a new router give over just putting the VPN software on the RP for example?