Is my power supply sufficient enough?

Just looking at the site you listed before I would go for:

If you're planning to use the servo heavily I would add a small heat sink but if you don't tend to let the servo stall/move heavy stuff it's fine.