Ok, seems that I won't get any further help here.
I did remove the Shaping yesterday as I was doing some more testing and realized that p2p traffic now was able to consume 50Mbit fine, while with shaping I only got 20 Mbit, so there is either something completely wrong in my setup/logic, or .. don't know ?
If anyone can shed some light into this, it would be much appreciated.