Ive had my 2004 bmw 330i zhp for about 3 years now, everything was running super good until one night when my headgasket decided it had enough. I got it looked at and found out the previous owner did work on it and messed up the tensioner threads and the headbolt threads. Machine work to fix plus labour for headgasket fix was way more then an engine swap. So what im getting to is im either looking to buy a m54b30 zhp engine, or a regular m54b30 engine i can swap my cam shafts into, or potentially even a zhp engine block because i beleive thats all i would need to repair to get everything rebuilt, aside the headgasket, I could be wrong though. I bought a ZAM to keep me going in the mean time but i would like to fix it up if possible this winter. I dont want to have to sell as part out. If anyone has any leads to anything or info to help me out, anything would be appreciated. I am located in Winnipeg, Manitoba in Canada, but im also willing to figure out shipping to make something happen. It would be preffered for something in canada but if something reasonable states side pops up i might consider. Thank you !