I agree, splashes and a china would be excellent.
Also consider sizes and types of crashes.
For example: 14" thin crash, 16" medium crash and an 18" crash go nicely together, added to a china ( 14" or a 20" or both!) , and a splash or two ( 10" and 6") then I think you will have all bases covered regarding the music styles you listed in your original post.
Good luck and happy cymbal shopping
