Hamman,
I am in a similar situatin to you but only out for 10 years or so.
I have just finished my full 17th, I only need the refresher but decided to go the whole hog. A good decision imo.
BTW I spoke in detail to one of the tech guys at NIC and he said just do the 17th. I will go back...