McLeod Ganj accommodation & transport from Rishikesh

I'm planning on travelling from Rishikesh to Dharamsala & I'm presuming that my only option is by bus? Considering that it's quite a long journey, can anyone suggest somewhere to stop for 1 night en route? If not, will just do the whole trip in one go.
Also, does anyone know of self-catering accommodation, as such i.e. kitchen included, in Mcleod Ganj, Dharmkot or Bhagsu (preferably the former though) as I plan to stay there for about a month?
Thanks.

you should be able to travel via rail at least part of the way. for instance there's rail service from haridwar to amritsar, chandigarh, etc. you can also transfer in Ambala (which is just outside Chandigarh) for a local service that might get you even closer.

supposedly there's a train route from Pathankot to Kangra, which is actually quite close to Dharamsala, but i haven't been able to get any real information about it on the india rail website.

There are plenty of long term stay places down the Yongling Stairs which are just off Jogibara Road. Just past the Refugee Reception Centre look for a seemingly endless flight of stairs on your left. If you arn't sure ask any local for Yongling School. Head down the steps. You will come to a Pink building on your right. That is Pink House. I know a few people who have stayed there. Most of the other buildings down the steps are long term Guest Houses they just arn't marked as such. Ask at all of them unil you find a room you like.
There are other long term places down Jogibara Road, up Tipa Road and on the Chonor House road/path.
For the first few days, until you find a place, stay at an ordinary Guest House. There are plenty in the guide book. This will save you hiking around town with all your gear. The long term places are a little harder to find but that is why they are cheaper. You should be able to get a place for a month for 4500 Rupees and up.
Have fun.

I travelled Rishikesh to Dharmsala last summer. There is a night train from Roorkee (about a 2 hour bus ride from Rishikesh) to Pathankot. Check the Indian Rail web site, I believe it departs around 9 or 10PM, arriving around 6 AM. From Pathankot, it's about a 4 hour bus ride to Dharmsala. There are direct night buses, which take about the same amount of time as the way I went, but with the train, you can get a good night's sleep!

McLeod - Green or Yellow Hotel on Bhagsu road.

There is a train from Rishikesh that arrives at an ungodly 3am at Pathankot from where you can take a bus to Dharamsala OR you can take a direct bus from Haridwar to Dharamsala (abit uncomfortable but nice scenary).

I don't recommend green hotel to anybody. I think Snow Lion Guest House is one of the best for longer stays.