Looks to me as though you are already pushing it with regards to stocking. I would steer clear of any tangs, butterflies or similar fishes as they just require more space than your 40 can provide.
I know it's a sad day when us fish keepers realize that we are outta room, but we have all been there, or at least will be.......
~Michael