I run a pretty similar set, Arikado.
Still can't decide if I like HP Ground or HP Rock better. Hihi and other powerful Fire threats die quickly to HP Ground, but HP Rock is definitely useful. Wouldn't mind experimenting with other HPs, but for now, it's between those two for me.