Nice approach! This also works fine for me if the package is not something to be imported by another package (i.e. a final product):
$ cd $GOPATH/src/github.com/username
$ git clone https://github.com/username/repo && cd repo
$ git remote add upstream https://github.com/original/repo
$ cd .. && cd .. && mkdir original
$ mv username/repo original/repo
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.