Shorten your rides a bit and get used to riding faster. Once you can ride at the speed you want, begin increasing the distance again. If you're set on your route - do some recreational intervals, pick maybe a 5K section and up the pace to what you want to be able to hit, then recover and do it again if you can. You get faster by riding faster.
All that being said, new bike stuff is great. Both of the wheelsets are good options - I would choose the wheels that your favorite shop carries. That way, and problems will be quickly taken care of. Also, in service of riding faster, developing that relationship and finding new people to add to your list of riding buddies will do wonders.