I would add that the government should be leading the way towards standardized and upbiquitous electrical charging stations to help transition to more electric cars/trucks on the road.Do you think airports are infrastructure? Rail lines? Utilities, incl. water/elect/broadband? Dams? Do you really think infrastructure is nothing more than roads & bridges?
Also, probably within roads and bridges, but instead of just fixing old structures, we should be adding whatever it takes to facilitate driverless cars/trucks (no idea what that entails - but we should be anticipating a move in that direction.
Broadband to remote areas of the country will have to be subsidized by the government - but that is probably the most 21st Century infrastructure project we need, and can be accomplished relatively easily.