Visa Run Needed For 1 Year Extension Of F Visa?

I'm an Australian working in Thailand with the Ministry of Health on a 1 year F visa and work permit that will expire end of this month. Bit confused as to whether I need to a visa run to extend my visa and work permit for another year. I've been told by the (kind of useless) administrator on my project that "her friends" say that I do not have to but she can't confirm for me. I've just re-entered Thailand in the last 3 weeks.

Also, can someone confirm for me that the steps for the new 1 year extension are:

1. Go to the Immigration bureau and apply for a one year extension of my F visa, bringing

- Application Form T.M. 7

- a letter of employment from Ministry of Health

- statement of taxes paid for last year

- one 4 x 6 cm photo.

2. Once the extension is granted (on the day of submission?) go to the Ministry of Labour to extend the work permit.

- Letter of employment

- Letter of power of attorney

- Work permit

Will Step 2 need to be done before the expiry of the 1st year visa and work permit? i.e. end of the month. Or so long as the visa is extended is that OK? i.e. visa is extended to next year but work permit has expired.