I don't think it really matters which you buy - Junebug or PicKit 2 - because in terms of functionality you're on to a winner with either of them. So the choice just comes down to your personal preference. If you insist on building your own, then the decision is made for you - Junebug.
The advice most of us are trying to offer is, don't waste your time with those old DIY designs. They're outdated, they support very few chips, and they lack the feaures you need. Get yourself something decent - Junebug or PicKit 2, you decide.
Brian