I knew about the forwarding and NAT not being needed and I forgot to remove the NAT rules. I've removed those and will see if things are any better.
As for PPTP, I shouldn't have to configure anything to use PPTP from my laptop connecting to my office, maybe I wasn't clear but throughput sucks over PPTP right now since switching to the POE-5.
