In my experience, you will get points for both rooms either way, although sometimes if they're booked as two different reservations you'll need to phone HHonors to get the points credited. Likewise, you'll only get stay and nights credit for one room, regardless if you do it as one or two reservations.
I've also had good success calling the hotel directly to modify reservations.