That layout looks good. A plumbing supply place may have plastic pipe or a fitting you can use to make angle rings. That's what I did.