in all honesty yes you should take the angel fish back, and get a full refund.. and if there are any other shops around, leave and go there. they should not have recommended two angelfish and two neons for a 40 litre tank, that is a very poor recommendation! angelfish will quite happily eat neons, they do in the wild, so in a tank neons do not have much of a chance! two angelfish will also outgrow a 40 litre tank they can get to the size of a small plate, so i would avoid those with your tank, and neons should not be kept in two's either, minimum of 6, but 10 is better. small shoaling fish are ideal fish for a tank your size, if you have it planted too, it can look very impressive with a shoal of pretty fish, and some corydoras catfish would be nice on the bottom, they like to be in small groups too.
its such a shame when you get such rubbish advice from a shop. but it does happen, sadly we cant assume that because someone works in a fish shop that they know anything about fish... the best thing you can do is research yourself, and go into a shop already knowing which fish you want, then you can avoid asking any dummy assistants for whatever limited knowledge they have! of course there are some very good shops with staff that do know what there on about.. but finding them in a challenge.
Gill


[url=http://www.fishkeeping.co.uk/articles_51/fishless-cycling-article.htm] 'CLICK ME' - 'Fishless Cycling' information - how to prepare your new t...