I think the one week is better as the endocrine system is one of the slowest in your body, I'm not sure it can really ramp up in response to a stimulus in just a day or two. A week will make sure your endocrine system (hormones) are back to nearly optimal levels. Also if you are eating maintenance, you should not gain any fat if any. You are not doing a week of binge eating here, you are just giving your body enough calories to function without much strain.
I would also use this week to go very light in the gym. Basically go in and get the blood flowing and then get out. This is a recovery week and your body will respond well if you take it easy. To be honest, you will probably feel pretty huge this week, if you do some higher rep stuff, you are going to get massive pumps from going back on the carbs. Just stay away from training to failure and high volume and you will be good to go. Also I would cut the cardio or HIIT back a notch too. You are preparing yourself this week to explode through the next 6 or 7 weeks and you want to have all the extra energy you can.
At 30 days I would say go another 2 weeks before doing your refeed week. You can still be losing good amounts of fat right now and your energy should still be decent. Everyone is different though, if you notice a huge drop in motivation, energy, or fatt loss, do the refeed sooner. Not everyone can be pinned to a specific template. Heck you may be able to go 8 weeks without a refeed.