Wait until you have an offer to talk more salary details......otherwise you might be painting yourself in a corner. It appears you are close enough not to be wasting everyone's time. Focus on selling yourself and understanding how you can help them.
To get the salary you want you will probably have to gently and respectfully walk away from initial offer.