I would contract these folks again
Hot water heater
Spigot replacement
Rod vanity sink
To remove old sub pump install new sub pump