Hi BikeRider, I had to check back in when I saw you posted.
First off, no PMI? That's awesome. Good for you!
Second, I like your revised Debt Payback Strategy. It may take a little while to knock it down, but once that beast is well and truly beat, everything else is gonna be a lot
Last, I realized that I focused a bit too hard in my initial response on the whole Student loan v. Equity loan thing. Taking a step back from that, let me say that you're doing great. I like that you don't maintain a CC debt. I love that that you've started a Roth IRA and your 401k numbers are solid (esp. after the madness of the last year). Finally, I am very impressed by your Emergency fund. That is a great number, 'specially considering everything else you've accomplished.
So, one last bit of advice. When you get that Emergency Fund to your target of $12,000, whatever you're setting aside towards it, shift it to your vacation fund - and when you find something fun that you want to do with that money, you go ahead and do it. This is coming from a guy ten years on from where you are with the wife and the kids and the what all.
Take that vacation. Make it a good one. You doing great and you deserve it.
Same goes for the midday lunch!
Alright, I'll shut up now.