B5 or B5.5 wagon with TDI/manual swap

Ok, looking for some comments here:

My wife and I currently own a B4 TDI wagon, and are thinking of upgrading to something more modern with less little stupid problems like doors that don't stay shut in the cold.

I currently drive a Golf IV TDI and really like the interior and looks. We have both loved B5 wagons for a while.

What makes more sense, getting a gas engine older wagon and swapping a TDI/manual into it,

Or, buying a 2003-04 TDI B5.5 Wagon and swapping a stick into it?
I really don't like the prices on the B5.5TDI wagons in the states, and the PD engine with high $$ oil changes would be nice to get away from,
so my inclination is to go with a gas wagon with a stick and put in a hotted-up 1.9TDI without PD.

Any comments?

I'd love a stick in my Passat sedan. Let me know if you go that route, and if its feasible.

Well... If you're good at these kind of intense projects I would say it's better to do a full swap with an older B5. Although looking at it from a PITA perspective Full Swap is a super PITA compared to the trans only. Either way your looking at euro sourced parts AFAIK.