I will assume you have the vacuum advance plugged off. I am not sure of your timing light but it sounds correct. YES, you need to advance your base timing to get the additional 2 degrees of total timing. Some distributors have a limit on the amount of centrifugal advance. Different springs may allow more timing but also may come in sooner.
Let us know if you get it where you want.