Which do you prefer? I personally love both, but I think that neo-psychedelia has really expanded on the original genre and incorporated a lot of electronic influences.