Yup, looks like you are on track

You could get away with 2 baffles were you have four between the fuge and skimmer. But I like how you did that to reduce the nosie the sump makes. That is a really really good idea. I'm goging to have to remember that little trick, nicely done