1. No, but does that really matter? There are many definitions and your way is as good as any, as long as you're aware of its caveats and flaws. The correct way, if you're using the 2y cash bond, is to take an appropriately weighted strip of ED contracts.
2. There are a few methodologies...