Would you consider rehoming the Rasbora's to have a larger shoal of neons that like you fit in well with the theme?
Harlequins will probably stay. Not a fan of rehoming fish once I've taken them in.......plus they were difficult enough to catch in a 50% drained and empty 30g. Don't fancy trying the same in a planted 320.