I'd say go with the bottom list.
Main reason being is that the larger rainbowfish (Melanotaenia fluviatilis) would prefer a bit longer tank, so the small Melanotaenia praecox would do better in that 36" tank length.
Make the Cherry barbs, Diamond Tetras, and Neon Dwarf rainbowfish groups 6 each (for social fish I prefer at least 6, try to have equal sex ratio or more females).